Author: cziegeler
Date: Fri Apr 28 09:42:39 2017
New Revision: 1793027
URL: http://svn.apache.org/viewvc?rev=1793027&view=rev
Log:
Update some bundles and framework version to get it tests running again
Modified:
sling/trunk/bundles/extensions/healthcheck/it/pom.xml
sling/trunk/bundles/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Modified: sling/trunk/bundles/extensions/healthcheck/it/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it/pom.xml?rev=1793027&r1=1793026&r2=1793027&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/it/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/it/pom.xml Fri Apr 28 09:42:39
2017
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>4.2.1</version>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java?rev=1793027&r1=1793026&r2=1793027&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/it/src/test/java/org/apache/sling/hc/it/core/U.java
Fri Apr 28 09:42:39 2017
@@ -41,7 +41,7 @@ public class U {
static void expectHealthChecks(int howMany, HealthCheckExecutor executor,
String ... tags) {
expectHealthChecks(howMany, executor, new
HealthCheckExecutionOptions(), tags);
}
-
+
/** Wait until the specified number of health checks are seen by supplied
executor */
static void expectHealthChecks(int howMany, HealthCheckExecutor executor,
HealthCheckExecutionOptions options, String ... tags) {
final long timeout = System.currentTimeMillis() + 10000L;
@@ -60,7 +60,7 @@ public class U {
}
fail("Did not get " + howMany + " health checks with tags " +
Arrays.asList(tags) + " after " + timeout + " msec (last count=" + count + ")");
}
-
+
static Option[] config() {
final String apiVersion = System.getProperty("sling.hc.api.version");
final String coreVersion = System.getProperty("sling.hc.core.version");
@@ -74,7 +74,7 @@ public class U {
repository("https://repository.apache.org/snapshots/";).id("apache-snapshots").allowSnapshots(),
when(localRepo.length() > 0).useOptions(
systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
- ),
+ ),
junitBundles(),
when(felixShell).useOptions(
provision(
@@ -85,8 +85,13 @@ public class U {
)
),
provision(
- mavenBundle("org.apache.felix", "org.apache.felix.scr",
"1.6.2"),
- mavenBundle("org.apache.felix",
"org.apache.felix.configadmin", "1.8.8"),
+ mavenBundle("org.apache.sling",
"org.apache.sling.commons.log", "4.0.6"),
+ mavenBundle("org.apache.sling",
"org.apache.sling.commons.logservice", "1.0.6"),
+ mavenBundle("org.slf4j", "slf4j-api", "1.7.13"),
+ mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.13"),
+ mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.13"),
+ mavenBundle("org.apache.felix", "org.apache.felix.scr",
"2.0.8"),
+ mavenBundle("org.apache.felix",
"org.apache.felix.configadmin", "1.8.10"),
mavenBundle("org.apache.felix",
"org.apache.felix.http.servlet-api", "1.1.0"),
mavenBundle("org.apache.sling",
"org.apache.sling.commons.johnzon", johnzonVersion),
mavenBundle("org.apache.sling", "org.apache.sling.hc.api",
apiVersion),
@@ -108,9 +113,7 @@ public class U {
mavenBundle("commons-collections", "commons-collections",
"3.2.1"),
mavenBundle("commons-io", "commons-io", "1.4"),
mavenBundle("commons-fileupload", "commons-fileupload",
"1.2.2"),
- mavenBundle("commons-lang", "commons-lang", "2.5"),
- mavenBundle("org.mortbay.jetty", "servlet-api-2.5",
"6.1.14")
- )
+ mavenBundle("commons-lang", "commons-lang", "2.5")
)
);
}
}
