svn commit: r1786421 - in /sling/trunk/testing/org.apache.sling.testing.paxexam/src/main/resources/templates: SlingOptions.txt SlingVersionResolver.txt

[olli]

Author: olli
Date: Fri Mar 10 19:09:42 2017
New Revision: 1786421

URL: http://svn.apache.org/viewvc?rev=1786421&view=rev
Log:
SLING-6464 Update options and versions to latest features

use Apache Tomcat 6.0.14 JSP and EL API wrappers

Modified:
    
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/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=1786421&r1=1786420&r2=1786421&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 10 19:09:42 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("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()
         );
     }

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=1786421&r1=1786420&r2=1786421&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 10 19:09:42 2017
@@ -34,8 +34,8 @@ public class SlingVersionResolver implem
     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");