You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/12/22 15:21:15 UTC
[sling-org-apache-sling-testing-paxexam] 02/11: SLING-7080 Update
options and versions to latest features
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 447a6fce643cd10c58fbe516e56f1883c3e3dce9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Dec 22 12:01:27 2017 +0100
SLING-7080 Update options and versions to latest features
---
.../apache/sling/testing/paxexam/SlingOptions.java | 37 ++++++++++++++--------
.../testing/paxexam/SlingVersionResolver.java | 2 +-
2 files changed, 24 insertions(+), 15 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 93ad6be..b201f07 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -229,6 +229,7 @@ public class SlingOptions {
public static Option slingCommonsThreads() {
return composite(
+ config(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.threads").version(versionResolver)
);
}
@@ -296,11 +297,11 @@ public class SlingOptions {
slingJcr(),
slingExtensionEvent(),
slingExtensionHealthcheck(),
+ jackrabbitVault(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver),
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver)
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver)
);
}
@@ -338,11 +339,11 @@ public class SlingOptions {
public static Option slingExtensionFsresource() {
return composite(
sling(),
+ jackrabbitVault(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.fsresource").version(versionResolver),
mavenBundle().groupId("javax.jcr").artifactId("jcr").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-jcr-commons").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver)
);
}
@@ -401,7 +402,7 @@ public class SlingOptions {
public static Option slingExtensionPipes() {
return composite(
sling(),
- jackrabbitSling(),
+ jackrabbit(),
slingExtensionEvent(),
slingExtensionQuery(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver)
@@ -549,9 +550,9 @@ public class SlingOptions {
return composite(
webconsole(),
sling(),
- jackrabbitSling(),
- jackrabbitOakSling(),
- tikaSling(),
+ jackrabbit(),
+ jackrabbitOak(),
+ tika(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.api").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.base").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.classloader").version(versionResolver),
@@ -857,7 +858,7 @@ public class SlingOptions {
);
}
- public static Option jackrabbitSling() {
+ public static Option jackrabbit() {
return composite(
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-api").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("jackrabbit-data").version(versionResolver),
@@ -885,11 +886,11 @@ public class SlingOptions {
);
}
- public static Option jackrabbitOakSling() {
+ public static Option jackrabbitOak() {
return composite(
scr(),
- jackrabbitSling(),
- tikaSling(),
+ jackrabbit(),
+ tika(),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-core").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob").version(versionResolver),
@@ -899,25 +900,33 @@ public class SlingOptions {
);
}
- public static Option tikaSling() {
+ public static Option jackrabbitVault() {
+ return composite(
+ scr(),
+ jackrabbit(),
+ mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver)
+ );
+ }
+
+ public static Option tika() {
return composite(
mavenBundle().groupId("org.apache.tika").artifactId("tika-core").version(versionResolver),
mavenBundle().groupId("org.apache.tika").artifactId("tika-bundle").version(versionResolver)
);
}
- public static Option composumSling() {
+ public static Option composum() {
return composite(
sling(),
slingJcr(),
slingScriptingJsp(),
slingExtensionEvent(),
+ jackrabbitVault(),
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-commons").version(versionResolver),
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-console").version(versionResolver),
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-jslibs").version(versionResolver),
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-user-management").version(versionResolver),
mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-package-manager").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit.vault").artifactId("org.apache.jackrabbit.vault").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment")
.put("whitelist.bundles", new String[]{"com.composum.core.commons", "com.composum.core.pckgmgr"})
.put("whitelist.name", "composum")
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 a465d74..eb21841 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -211,7 +211,7 @@ public class SlingVersionResolver implements VersionResolver {
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");
- versions.put("org.apache.sling:org.apache.sling.validation.core", "1.0.0");
+ versions.put("org.apache.sling:org.apache.sling.validation.core", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.xss", "2.0.0");
versions.put("org.apache.tika:tika-bundle", "1.17");
versions.put("org.apache.tika:tika-core", "1.17");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.