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 2017/03/17 09:08:50 UTC
svn commit: r1787306 - in
/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main:
java/org/apache/sling/testing/paxexam/ resources/templates/
Author: olli
Date: Fri Mar 17 09:08:50 2017
New Revision: 1787306
URL: http://svn.apache.org/viewvc?rev=1787306&view=rev
Log:
adjust bundles (jsp-api and el-api)
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
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
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=1787306&r1=1787305&r2=1787306&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 Fri Mar 17 09:08:50 2017
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-api").version(versionResolver),
config()
);
}
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=1787306&r1=1787305&r2=1787306&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 Fri Mar 17 09:08:50 2017
@@ -34,8 +34,8 @@ public class SlingVersionResolver implem
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt?rev=1787306&r1=1787305&r2=1787306&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingOptions.txt Fri Mar 17 09:08:50 2017
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-api").version(versionResolver),
config()
);
}
Modified: sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt
URL: http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt?rev=1787306&r1=1787305&r2=1787306&view=diff
==============================================================================
--- sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt (original)
+++ sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates/SlingVersionResolver.txt Fri Mar 17 09:08:50 2017
@@ -34,8 +34,8 @@ public class SlingVersionResolver implem
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");