Author: olli
Date: Fri Aug 12 19:31:53 2016
New Revision: 1756217
URL: http://svn.apache.org/viewvc?rev=1756217&view=rev
Log:
update SlingOptions and SlingVersionResolver (Jackrabbit and Oak, remove all
snapshots)
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
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=1756217&r1=1756216&r2=1756217&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 Aug 12 19:31:53 2016
@@ -167,24 +167,6 @@ public class SlingOptions {
);
}
- public static Option slingCommonsMessaging() {
- return composite(
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging").version(versionResolver)
- );
- }
-
- public static Option slingCommonsMessagingMail() {
- return composite(
- scr(),
- slingCommonsMessaging(),
- slingCommonsThreads(),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.messaging.mail").version(versionResolver),
-
mavenBundle().groupId("com.sun.mail").artifactId("javax.mail").version(versionResolver),
-
mavenBundle().groupId("javax.mail").artifactId("javax.mail-api").version(versionResolver),
-
mavenBundle().groupId("org.apache.commons").artifactId("commons-email").version(versionResolver)
- );
- }
-
public static Option slingCommonsMetrics() {
return composite(
scr(),
@@ -327,14 +309,6 @@ public class SlingOptions {
);
}
- public static Option slingExtensionValidation() {
- return composite(
- sling(),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.api").version(versionResolver),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.core").version(versionResolver)
- );
- }
-
public static Option slingExtensionXss() {
return composite(
sling(),
@@ -420,17 +394,6 @@ public class SlingOptions {
);
}
- public static Option slingJcrRepoinit() {
- return composite(
- sling(),
- slingJcr(),
- slingJcrJackrabbitSecurity(),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.repoinit").version(versionResolver),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.repoinit.parser").version(versionResolver),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.provisioning.model").version(versionResolver)
- );
- }
-
public static Option slingLaunchpadContent() {
return composite(
sling(),
@@ -446,14 +409,12 @@ public class SlingOptions {
sling(),
slingServlets(),
slingInstaller(),
- slingJcrRepoinit(),
slingExtensionAdapter(),
slingExtensionBundleresource(),
slingExtensionDiscoveryOak(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.prefs").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.memoryusage").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.packageadmin").version(versionResolver),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.karaf-repoinit").version(versionResolver),
newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
.put("model.section.name", "")
.put("text.url",
"classpath://org.apache.sling.karaf-repoinit/repoinit.txt")
@@ -749,14 +710,6 @@ public class SlingOptions {
);
}
- public static Option slingScriptingFreemarker() {
- return composite(
- sling(),
- slingScripting(),
-
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.freemarker").version(versionResolver)
- );
- }
-
public static Option slingScriptingGroovy() {
return composite(
sling(),
@@ -787,31 +740,6 @@ public class SlingOptions {
);
}
- public static Option slingSamplesFling() {
- return composite(
- sling(),
- slingScriptingThymeleaf(),
- slingCommonsMessaging(),
- slingCommonsMessagingMail(),
- slingExtensionModels(),
- slingExtensionQuery(),
- slingExtensionValidation(),
- slingAuthForm(),
-
mavenBundle().groupId("org.apache.sling.samples").artifactId("org.apache.sling.samples.fling").version(versionResolver),
-
newConfiguration("org.apache.sling.commons.messaging.mail.internal.SimpleMailBuilder")
- .put("from", "[email protected]")
- .put("smtpUsername", "sling")
- .put("smtpPort", "8025")
- .put("subject", "message from fling")
- .put("smtpPassword", "fling")
- .put("smtpHostname", "localhost")
- .asOption(),
-
newConfiguration("org.apache.sling.samples.fling.internal.WiserSmtpService")
- .put("smtpPort", "8025")
- .asOption()
- );
- }
-
public static Option composumSling() {
return composite(
sling(),
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=1756217&r1=1756216&r2=1756217&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 Aug 12 19:31:53 2016
@@ -56,7 +56,6 @@ public class SlingVersionResolver implem
versions.put("com.composum.sling.core:composum-sling-core-console",
"1.5.3");
versions.put("com.composum.sling.core:composum-sling-core-jslibs",
"1.5.3");
versions.put("com.google.guava:guava", "15.0");
- versions.put("com.sun.mail:javax.mail", "1.5.5");
versions.put("commons-codec:commons-codec", "1.10");
versions.put("commons-collections:commons-collections", "3.2.2");
versions.put("commons-fileupload:commons-fileupload", "1.3.2");
@@ -65,9 +64,7 @@ public class SlingVersionResolver implem
versions.put("io.dropwizard.metrics:metrics-core", "3.1.2");
versions.put("io.wcm.osgi.wrapper:io.wcm.osgi.wrapper.rxjava",
"1.0.14-0000");
versions.put("javax.jcr:jcr", "2.0");
- versions.put("javax.mail:javax.mail-api", "1.5.5");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
- versions.put("org.apache.commons:commons-email", "1.4");
versions.put("org.apache.commons:commons-lang3", "3.4");
versions.put("org.apache.commons:commons-math", "2.2");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
@@ -84,19 +81,19 @@ public class SlingVersionResolver implem
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec",
"1.1.1");
versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.2");
versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
- versions.put("org.apache.jackrabbit:jackrabbit-api", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-data", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.12.2");
- versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.12.2");
- versions.put("org.apache.jackrabbit:oak-blob", "1.5.5");
- versions.put("org.apache.jackrabbit:oak-commons", "1.5.5");
- versions.put("org.apache.jackrabbit:oak-core", "1.5.5");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.5.5");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.5.5");
- versions.put("org.apache.jackrabbit:oak-segment", "1.5.5");
+ versions.put("org.apache.jackrabbit:jackrabbit-api", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-data", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.13.1");
+ versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.13.1");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.5.7");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.5.7");
+ versions.put("org.apache.jackrabbit:oak-core", "1.5.7");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.5.7");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.5.7");
+ versions.put("org.apache.jackrabbit:oak-segment", "1.5.7");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault",
"3.1.26");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino",
"1.7.7.1_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter",
"4.0.4_1");
@@ -112,8 +109,6 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader",
"1.0.2");
versions.put("org.apache.sling:org.apache.sling.commons.html",
"1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.json",
"2.0.18");
- versions.put("org.apache.sling:org.apache.sling.commons.messaging",
"0.0.1-SNAPSHOT");
-
versions.put("org.apache.sling:org.apache.sling.commons.messaging.mail",
"0.0.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.commons.metrics",
"1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.mime",
"2.1.8");
versions.put("org.apache.sling:org.apache.sling.commons.osgi",
"2.4.0");
@@ -135,7 +130,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump",
"0.2.2");
versions.put("org.apache.sling:org.apache.sling.featureflags",
"1.0.2");
versions.put("org.apache.sling:org.apache.sling.fsresource", "1.1.4");
- versions.put("org.apache.sling:org.apache.sling.hc.core",
"1.2.5-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.hc.jmx", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.hc.support", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.hc.webconsole",
"1.1.2");
@@ -153,14 +148,12 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.4");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager",
"2.1.2");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager",
"2.2.4");
- versions.put("org.apache.sling:org.apache.sling.jcr.oak.server",
"1.0.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.jcr.oak.server",
"1.1.0");
versions.put("org.apache.sling:org.apache.sling.jcr.registration",
"1.0.2");
- versions.put("org.apache.sling:org.apache.sling.jcr.repoinit",
"1.0.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.resource",
"2.8.0");
versions.put("org.apache.sling:org.apache.sling.jcr.webconsole",
"1.0.2");
versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.4");
versions.put("org.apache.sling:org.apache.sling.jmx.provider",
"1.0.2");
- versions.put("org.apache.sling:org.apache.sling.karaf-repoinit",
"0.1.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.launchpad.content",
"2.0.8");
versions.put("org.apache.sling:org.apache.sling.models.api", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.models.impl", "1.2.8");
@@ -168,16 +161,13 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-resourceprovider",
"1.1.0");
versions.put("org.apache.sling:org.apache.sling.nosql.generic",
"1.1.0");
versions.put("org.apache.sling:org.apache.sling.nosql.mongodb-resourceprovider",
"1.1.0");
- versions.put("org.apache.sling:org.apache.sling.provisioning.model",
"1.4.4");
versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
- versions.put("org.apache.sling:org.apache.sling.repoinit.parser",
"1.0.3-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.resource.inventory",
"1.0.4");
versions.put("org.apache.sling:org.apache.sling.resourcemerger",
"1.3.0");
versions.put("org.apache.sling:org.apache.sling.resourceresolver",
"1.4.16");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.1.4");
versions.put("org.apache.sling:org.apache.sling.scripting.api",
"2.1.8");
versions.put("org.apache.sling:org.apache.sling.scripting.core",
"2.0.38");
- versions.put("org.apache.sling:org.apache.sling.scripting.freemarker",
"1.0.0-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.scripting.groovy",
"1.0.2");
versions.put("org.apache.sling:org.apache.sling.scripting.java",
"2.0.14");
versions.put("org.apache.sling:org.apache.sling.scripting.javascript",
"2.0.30");
@@ -193,10 +183,7 @@ public class SlingVersionResolver implem
versions.put("org.apache.sling:org.apache.sling.servlets.resolver",
"2.4.4");
versions.put("org.apache.sling:org.apache.sling.settings", "1.3.8");
versions.put("org.apache.sling:org.apache.sling.urlrewriter", "0.0.2");
- versions.put("org.apache.sling:org.apache.sling.validation.api",
"1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.validation.core",
"1.0.0-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.xss", "1.0.8");
-
versions.put("org.apache.sling.samples:org.apache.sling.samples.fling",
"0.0.1-SNAPSHOT");
versions.put("org.apache.tika:tika-bundle", "1.13");
versions.put("org.apache.tika:tika-core", "1.13");
versions.put("org.codehaus.groovy:groovy", "2.4.7");
