Author: olli
Date: Fri Mar 10 20:05:11 2017
New Revision: 1786426
URL: http://svn.apache.org/viewvc?rev=1786426&view=rev
Log:
SLING-6464 Update options and versions to latest features
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
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=1786426&r1=1786425&r2=1786426&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 10 20:05:11 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()
);
}
@@ -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")
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=1786426&r1=1786425&r2=1786426&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 10 20:05:11 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");
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=1786426&r1=1786425&r2=1786426&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 20:05:11 2017
@@ -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")
