sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-testing-paxexam] 33/39: adjust bundles (jsp-api and el-api)
Date Tue, 07 Nov 2017 10:21:02 GMT
This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag org.apache.sling.testing.paxexam-0.0.4
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git

commit e730cd906cfc31230d6291a5fb342fef68abaef1
Author: Oliver Lietz <olli@apache.org>
AuthorDate: Fri Mar 17 09:08:50 2017 +0000

    adjust bundles (jsp-api and el-api)
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787306
13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java      | 4 ++--
 .../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java   | 4 ++--
 src/main/resources/templates/SlingOptions.txt                         | 4 ++--
 src/main/resources/templates/SlingVersionResolver.txt                 | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index c177ac1..86a9f26 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -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()
         );
     }
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
index 2ee4f75..0ba19ea 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
     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");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 4a8f942..e8b0535 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -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()
         );
     }
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 7fe7de4..8c0d153 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
     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");

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.

Mime
View raw message