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 d6d131df7d4166c8296a56d47268439dfc27755e Author: Oliver Lietz <[email protected]> AuthorDate: Fri Mar 10 20:05:11 2017 +0000 SLING-6464 Update options and versions to latest features git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786426 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/sling/testing/paxexam/SlingOptions.java | 17 +++++++++++------ .../sling/testing/paxexam/SlingVersionResolver.java | 4 ++-- src/main/resources/templates/SlingOptions.txt | 1 + 3 files changed, 14 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 e843ceb..8c5dc00 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("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() ); } @@ -615,9 +615,6 @@ public class SlingOptions { .put("jaas.configProviderName", "FelixJaasProvider") .put("jaas.defaultRealmName", "jackrabbit.oak") .asOption(), - newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService") - .put("localIndexDir", "sling/repository/index") - .asOption(), newConfiguration("org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl") .put("org.apache.jackrabbit.oak.authentication.configSpiName", "FelixJaasProvider") .asOption(), @@ -641,8 +638,12 @@ public class SlingOptions { public static Option slingLaunchpadOakTar() { return composite( slingLaunchpadOak(), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), + newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService") + .put("localIndexDir", "sling/repository/index") + .asOption(), newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService") .put("name", "Default NodeStore") .put("repository.home", "sling/repository") @@ -653,9 +654,13 @@ public class SlingOptions { public static Option slingLaunchpadOakMongo() { return composite( slingLaunchpadOak(), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver), mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver), mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), + newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService") + .put("localIndexDir", "sling/repository/index") + .asOption(), newConfiguration("org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService") .put("db", "sling") .put("mongouri", "mongodb://localhost:27017") @@ -823,7 +828,6 @@ public class SlingOptions { mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jcr").version(versionResolver), - mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver), mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver), mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(versionResolver) ); @@ -861,6 +865,7 @@ public class SlingOptions { final String localIndexDir = String.format("%s/index", repositoryHome); return composite( slingLaunchpadOak(), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), newConfiguration("org.apache.felix.http") 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 67e49e5..329bade 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("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"); diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt index 79b308f..068b219 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -122,6 +122,7 @@ public class SlingOptions { final String localIndexDir = String.format("%s/index", repositoryHome); return composite( slingLaunchpadOak(), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), newConfiguration("org.apache.felix.http") -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
