[sling-org-apache-sling-testing-paxexam] 28/39: SLING-6464 Update options and versions to latest features

[ro...@apache.org]

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 09f5f21c8b80f923ca328d7716ff852292b33155
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 10 19:09:42 2017 +0000

    SLING-6464 Update options and versions to latest features
    
    use Apache Tomcat 6.0.14 JSP and EL API wrappers
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786421 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/resources/templates/SlingOptions.txt         | 4 ++--
 src/main/resources/templates/SlingVersionResolver.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index b135f7f..79b308f 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("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").version(versionResolver),
-            mavenBundle().groupId("javax.el").artifactId("javax.el-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),
             config()
         );
     }
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 7956e98..7fe7de4 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("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
-        versions.put("javax.el:javax.el-api", "2.2.1");
+        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.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" <co...@sling.apache.org>.