You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/07/25 14:16:23 UTC
svn commit: r1754012 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam:
SlingOptions.java SlingVersionResolver.java
Author: olli
Date: Mon Jul 25 14:16:23 2016
New Revision: 1754012
URL: http://svn.apache.org/viewvc?rev=1754012&view=rev
Log:
update SlingOptions and SlingVersionResolver
Modified:
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java?rev=1754012&r1=1754011&r2=1754012&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java Mon Jul 25 14:16:23 2016
@@ -103,8 +103,7 @@ public class SlingOptions {
mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-math").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver)
);
}
@@ -128,8 +127,7 @@ public class SlingOptions {
slingCommonsClassloader(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.fsclassloader").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
- mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver)
);
}
@@ -164,8 +162,8 @@ public class SlingOptions {
scr(),
slingCommonsThreads(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.scheduler").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver)
);
}
@@ -491,8 +489,7 @@ public class SlingOptions {
sling(),
webconsole(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version(versionResolver)
);
}
@@ -553,12 +550,12 @@ public class SlingOptions {
mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver),
+ mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-atinject_1.0_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-el_2.2_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-interceptor_1.1_spec").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jcdi_1.0_spec").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver)
);
}
@@ -728,8 +725,7 @@ public class SlingOptions {
return composite(
sling(),
slingScripting(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.java").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-servlet_3.0_spec").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.java").version(versionResolver)
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java?rev=1754012&r1=1754011&r2=1754012&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java Mon Jul 25 14:16:23 2016
@@ -57,6 +57,7 @@ public class SlingVersionResolver implem
versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava", "1.0.14-0000");
versions.put("javax.jcr:jcr", "2.0");
versions.put("javax.mail:javax.mail-api", "1.5.5");
+ versions.put("javax.servlet:javax.servlet-api", "3.1.0");
versions.put("org.apache.commons:commons-email", "1.4");
versions.put("org.apache.commons:commons-lang3", "3.4");
versions.put("org.apache.commons:commons-math", "2.2");
@@ -72,7 +73,6 @@ public class SlingVersionResolver implem
versions.put("org.apache.geronimo.specs:geronimo-interceptor_1.1_spec", "1.0");
versions.put("org.apache.geronimo.specs:geronimo-jcdi_1.0_spec", "1.0");
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec", "1.1.1");
- versions.put("org.apache.geronimo.specs:geronimo-servlet_3.0_spec", "1.0");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.2");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
versions.put("org.apache.jackrabbit:jackrabbit-api", "2.12.2");
@@ -92,7 +92,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.1_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter", "4.0.4_1");
versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.8");
- versions.put("org.apache.sling:org.apache.sling.api", "2.12.0");
+ versions.put("org.apache.sling:org.apache.sling.api", "2.14.0");
versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.16");
versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.auth.openid", "1.0.4");
@@ -108,7 +108,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.1.8");
versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
- versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.4.14");
+ versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.5.0");
versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.6");
versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.discovery.base", "1.1.4");
@@ -163,7 +163,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.0");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.4.12");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.4.16");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.1.4");
versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.1.8");
versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.38");