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/20 21:27:17 UTC
[sling-org-apache-sling-testing-paxexam] branch master updated
(006c17b -> d74e088)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
from 006c17b SLING-7213 - Add a default .gitignore file to every module
new a6043ff SLING-7080 Update options and versions to latest features
new b79507c use Sling parent 32
new d74e088 use org.apache.felix.framework 5.6.10
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 +-
.../apache/sling/testing/paxexam/SlingOptions.java | 46 ++++--
.../testing/paxexam/SlingVersionResolver.java | 162 ++++++++++-----------
.../resources/templates/SlingVersionResolver.txt | 17 +--
4 files changed, 121 insertions(+), 108 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-testing-paxexam] 02/03: use Sling parent 32
Posted by ol...@apache.org.
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 b79507c7fd8b5072dcac1d5050ee6c38c12a8459
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 20 21:16:29 2017 +0100
use Sling parent 32
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 314009e..c0b89f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>31</version>
+ <version>32</version>
<relativePath />
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 01/03: SLING-7080 Update
options and versions to latest features
Posted by ol...@apache.org.
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 a6043ff2fc746ff0361d4dbb32ac1a6dd71ea115
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 20 21:15:58 2017 +0100
SLING-7080 Update options and versions to latest features
---
.../apache/sling/testing/paxexam/SlingOptions.java | 46 ++++--
.../testing/paxexam/SlingVersionResolver.java | 162 ++++++++++-----------
.../resources/templates/SlingVersionResolver.txt | 17 +--
3 files changed, 119 insertions(+), 106 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 cca945e..2663ad6 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -163,6 +163,7 @@ public class SlingOptions {
public static Option slingCommonsCompiler() {
return composite(
+ scr(),
slingCommonsClassloader(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.compiler").version(versionResolver)
);
@@ -207,7 +208,8 @@ public class SlingOptions {
slingCommonsThreads(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.scheduler").version(versionResolver),
mavenBundle().groupId("javax.servlet").artifactId("javax.servlet-api").version(versionResolver),
- mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver)
+ mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jta_1.1_spec").version(versionResolver),
+ mavenBundle().groupId("io.dropwizard.metrics").artifactId("metrics-core").version(versionResolver)
);
}
@@ -258,6 +260,9 @@ public class SlingOptions {
slingExtensionDiscovery(),
slingExtensionHealthcheck(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.oak").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-discovery\n\n create path (sling:Folder) /var/discovery\n\n create path (sling:Folder) /var/discovery/oak\n\n set ACL for sling-discovery\n\n allow jcr:read on /var/discovery\n\n allow rep:write on /var/discovery\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.discovery.commons=sling-discovery", "org.apache.sling.discovery.base=sling-discovery", "org.apache.sling.discovery.oak=sling-discovery"})
.asOption()
@@ -292,6 +297,9 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.event").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.event.dea").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-event\n\n create path (sling:Folder) /var/eventing\n\n set ACL for sling-event\n\n allow jcr:all on /var/eventing\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.event=sling-event", "org.apache.sling.event.dea=sling-event"})
.asOption()
@@ -341,6 +349,9 @@ public class SlingOptions {
return composite(
sling(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.i18n").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-i18n\n\n set ACL for sling-i18n\n\n allow jcr:read on /\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.i18n=sling-i18n"})
.asOption()
@@ -377,9 +388,9 @@ public class SlingOptions {
return composite(
sling(),
jackrabbitSling(),
+ slingExtensionEvent(),
slingExtensionQuery(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.json").version(versionResolver)
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver)
);
}
@@ -452,6 +463,9 @@ public class SlingOptions {
slingServlets(),
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),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-validation\n\n create path (sling:Folder) /apps\n\n create path (sling:Folder) /libs\n\n set ACL for sling-validation\n\n allow jcr:read on /apps\n\n allow jcr:read on /libs\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.validation.core=sling-validation"})
.asOption()
@@ -464,6 +478,9 @@ public class SlingOptions {
sling(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.xss").version(versionResolver),
mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-xss\n\n create path (sling:Folder) /apps/sling/xss\n\n create path (sling:Folder) /libs/sling/xss\n\n set ACL for sling-xss\n\n allow jcr:read on /apps/sling/xss\n\n allow jcr:read on /libs/sling/xss\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.xss=sling-xss"})
.asOption(),
@@ -505,6 +522,9 @@ public class SlingOptions {
slingInstaller(),
slingJcr(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.provider.jcr").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-jcr-install\n\n create path (sling:Folder) /apps/sling/install\n\n set ACL for sling-jcr-install\n\n allow jcr:read on /\n\n allow rep:write on /apps/sling/install\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.installer.provider.jcr=sling-jcr-install"})
.asOption()
@@ -528,11 +548,14 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webconsole").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.webdav").version(versionResolver),
factoryConfiguration("org.apache.sling.jcr.base.internal.LoginAdminWhitelist.fragment")
- .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons", "org.apache.sling.discovery.base", "org.apache.sling.discovery.oak", "org.apache.sling.extensions.webconsolesecurityprovider", "org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader", "org.apache.sling.jcr.contentloader", "org.apache.sling.jcr.davex", "org.apache.sling.jcr.jackrabbit.usermanager", "org.apache.sling.jcr.oak.server", "org.apache.sling.jcr.repoinit", "org.apache.sling.jcr.re [...]
+ .put("whitelist.bundles", new String[]{"org.apache.sling.discovery.commons", "org.apache.sling.discovery.base", "org.apache.sling.discovery.oak", "org.apache.sling.jcr.base", "org.apache.sling.jcr.classloader", "org.apache.sling.jcr.contentloader", "org.apache.sling.jcr.jackrabbit.usermanager", "org.apache.sling.jcr.oak.server", "org.apache.sling.jcr.repoinit", "org.apache.sling.jcr.webconsole"})
.put("whitelist.name", "sling")
.asOption(),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-mapping\n\n create service user sling-readall\n\n create path (sling:Folder) /apps\n\n create path (sling:Folder) /libs\n\n create path (sling:Folder) /var\n\n create path (sling:OrderedFolder) /content\n\n set ACL for everyone\n\n allow jcr:read on /\n\n end\n\n set ACL for sling-mapping\n\n allow jcr:read on /\n\n end\n\n set ACL for sling-readall\n\n allow jcr:read on /\n\n [...]
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
- .put("user.mapping", new String[]{"org.apache.sling.jcr.resource:observation=sling-readall"})
+ .put("user.mapping", new String[]{"org.apache.sling.jcr.resource:observation=sling-readall", "org.apache.sling.jcr.resource:validation=sling-readall"})
.asOption()
);
}
@@ -560,7 +583,6 @@ public class SlingOptions {
sling(),
slingJcr(),
slingJcrJackrabbitSecurity(),
- paxUrlClasspath(),
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)
@@ -614,13 +636,9 @@ public class SlingOptions {
slingExtensionAdapter(),
slingExtensionBundleresource(),
slingExtensionDiscoveryOak(),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.karaf-repoinit").version(versionResolver),
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),
- newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer")
- .put("references", new String[]{"raw:classpath://org.apache.sling.karaf-repoinit/sling.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-discovery.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-event.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-i18n.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-installer-jcr.txt", "raw:classpath://org.apache.sling.karaf-repoinit/sling-scripting.txt", "raw:classpath://org.apache.sling [...]
- .asOption(),
factoryConfiguration("org.apache.felix.jaas.Configuration.factory")
.put("jaas.classname", "org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule")
.put("jaas.controlFlag", "optional")
@@ -688,6 +706,7 @@ public class SlingOptions {
newConfiguration("org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService")
.put("db", "sling")
.put("mongouri", "mongodb://localhost:27017")
+ .put("repository.home", "sling/repository")
.asOption()
);
}
@@ -722,6 +741,9 @@ public class SlingOptions {
webconsole(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.api").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version(versionResolver),
+ factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
+ .put("scripts", new String[]{"create service user sling-scripting\n\n create path (sling:Folder) /apps\n\n create path (sling:Folder) /libs\n\n set ACL for sling-scripting\n\n allow jcr:read on /apps\n\n allow jcr:read on /libs\n\n end"})
+ .asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
.put("user.mapping", new String[]{"org.apache.sling.scripting.core=sling-scripting"})
.asOption()
@@ -774,6 +796,7 @@ public class SlingOptions {
sling(),
slingJcr(),
slingScripting(),
+ slingScriptingJavascript(),
slingExtensionI18n(),
slingExtensionModels(),
slingExtensionXss(),
@@ -906,8 +929,7 @@ public class SlingOptions {
.asOption(),
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
.put("localIndexDir", localIndexDir)
- .asOption(),
- mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver) // OAK-5921
+ .asOption()
);
}
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 ac5148b..f451aba 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -37,51 +37,50 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.16");
- versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
- versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.4");
+ versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.10");
+ versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.8");
versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
- versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
+ versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.8");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.3");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.7");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5");
- versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
- versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2");
- versions.put("org.apache.felix:org.apache.felix.scr", "2.0.12");
+ versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
+ versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.6");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.14");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.4");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
- versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
- versions.put("org.slf4j:log4j-over-slf4j", "1.7.25");
+ versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.4");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.4");
versions.put("com.composum.sling.core:composum-sling-core-commons", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-core-console", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-package-manager", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-user-management", "1.8.2");
- versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.0");
- versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.0");
- versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.0");
+ versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.3");
+ versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.3");
+ versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.3");
versions.put("com.google.guava:guava", "15.0");
versions.put("com.h2database:h2-mvstore", "1.4.196");
versions.put("com.sun.mail:javax.mail", "1.6.0");
- versions.put("commons-codec:commons-codec", "1.10");
+ versions.put("commons-codec:commons-codec", "1.11");
versions.put("commons-collections:commons-collections", "3.2.2");
versions.put("commons-fileupload:commons-fileupload", "1.3.3");
- versions.put("commons-io:commons-io", "2.5");
+ versions.put("commons-io:commons-io", "2.6");
versions.put("commons-lang:commons-lang", "2.6");
- versions.put("io.dropwizard.metrics:metrics-core", "3.2.4");
+ versions.put("io.dropwizard.metrics:metrics-core", "3.2.5");
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.6.0");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
versions.put("org.apache.commons:commons-collections4", "4.1");
versions.put("org.apache.commons:commons-email", "1.5");
- versions.put("org.apache.commons:commons-lang3", "3.6");
+ versions.put("org.apache.commons:commons-lang3", "3.7");
versions.put("org.apache.commons:commons-math", "2.2");
- versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
+ versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
versions.put("org.apache.felix:org.apache.felix.jaas", "1.0.2");
versions.put("org.apache.felix:org.apache.felix.prefs", "1.1.0");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage", "1.0.6");
@@ -92,64 +91,63 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.geronimo.specs:geronimo-interceptor_1.1_spec", "1.0");
versions.put("org.apache.geronimo.specs:geronimo-jcdi_1.0_spec", "1.0");
versions.put("org.apache.geronimo.specs:geronimo-jta_1.1_spec", "1.1.1");
- versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.3");
- versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.6");
- versions.put("org.apache.jackrabbit:jackrabbit-api", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-data", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.14.2");
- versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.14.2");
- versions.put("org.apache.jackrabbit:oak-blob", "1.6.4");
- versions.put("org.apache.jackrabbit:oak-commons", "1.6.4");
- versions.put("org.apache.jackrabbit:oak-core", "1.6.4");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.6.4");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.6.4");
- versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.4");
- versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.40");
- versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.2_1");
- versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.1_1");
+ versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.4");
+ versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.8");
+ versions.put("org.apache.jackrabbit:jackrabbit-api", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-data", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.16.0");
+ versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.16.0");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-core", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.6.7");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.7");
+ versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.42");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2.3_1");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.urlrewritefilter", "4.0.4_1");
versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.10");
- versions.put("org.apache.sling:org.apache.sling.api", "2.16.2");
- versions.put("org.apache.sling:org.apache.sling.auth.core", "1.4.0");
+ versions.put("org.apache.sling:org.apache.sling.api", "2.16.4");
+ versions.put("org.apache.sling:org.apache.sling.auth.core", "1.4.2");
versions.put("org.apache.sling:org.apache.sling.auth.form", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.auth.openid", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.auth.selector", "1.0.6");
- versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.2.0");
+ versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.3.0");
versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.0");
- versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.0");
- versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.4");
+ versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.0");
- versions.put("org.apache.sling:org.apache.sling.commons.json", "2.0.20");
- versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.2");
+ versions.put("org.apache.sling:org.apache.sling.commons.metrics", "1.2.4");
versions.put("org.apache.sling:org.apache.sling.commons.mime", "2.1.10");
versions.put("org.apache.sling:org.apache.sling.commons.osgi", "2.4.0");
- versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.6.2");
- versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.6");
+ versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.7.2");
+ versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.10");
versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.discovery.base", "2.0.4");
versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.20");
versions.put("org.apache.sling:org.apache.sling.discovery.impl", "1.2.12");
- versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.20");
+ versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.22");
versions.put("org.apache.sling:org.apache.sling.discovery.standalone", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.discovery.support", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.distribution.api", "0.3.0");
versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.8");
- versions.put("org.apache.sling:org.apache.sling.engine", "2.6.8");
- versions.put("org.apache.sling:org.apache.sling.event", "4.2.6");
+ versions.put("org.apache.sling:org.apache.sling.engine", "2.6.10");
+ versions.put("org.apache.sling:org.apache.sling.event", "4.2.10");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.extensions.explorer", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
- versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.0");
+ versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.6");
- versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.0");
- versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.8");
+ versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.2");
+ versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.10");
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");
- versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.8");
+ versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.10");
versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.10");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
@@ -161,70 +159,64 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.jcr.classloader", "3.2.2");
versions.put("org.apache.sling:org.apache.sling.jcr.compiler", "2.1.0");
versions.put("org.apache.sling:org.apache.sling.jcr.contentloader", "2.2.4");
- versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.8");
+ versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.10");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.accessmanager", "3.0.0");
versions.put("org.apache.sling:org.apache.sling.jcr.jackrabbit.usermanager", "2.2.6");
versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.1.4");
- versions.put("org.apache.sling:org.apache.sling.jcr.registration", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.4");
- versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.4");
+ versions.put("org.apache.sling:org.apache.sling.jcr.registration", "1.0.4");
+ versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.6");
+ versions.put("org.apache.sling:org.apache.sling.jcr.resource", "3.0.8");
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.8");
versions.put("org.apache.sling:org.apache.sling.jmx.provider", "1.0.2");
- versions.put("org.apache.sling:org.apache.sling.karaf-repoinit", "0.2.0");
versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.12");
- versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.4");
- versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.2");
- versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.6");
+ versions.put("org.apache.sling:org.apache.sling.models.impl", "1.4.6");
+ versions.put("org.apache.sling:org.apache.sling.models.jacksonexporter", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.nosql.couchbase-client", "1.0.2");
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.pipes", "0.0.10");
+ versions.put("org.apache.sling:org.apache.sling.pipes", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
- versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.1.0");
+ versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.2.0");
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.2");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.4");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.30");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.32");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.2.0");
- versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.46");
+ versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.54");
versions.put("org.apache.sling:org.apache.sling.scripting.groovy", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.scripting.java", "2.1.2");
- versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "3.0.0");
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.0");
+ versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "3.0.4");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.4");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp.taglib", "2.2.6");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.36");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.10");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.10");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.22");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.46");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.16");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.18");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.26");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.0");
- versions.put("org.apache.sling:org.apache.sling.security", "1.1.6");
- versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.3.4");
- versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.26");
+ versions.put("org.apache.sling:org.apache.sling.security", "1.1.10");
+ versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.3.6");
+ versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.30");
versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.22");
- versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.12");
+ versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.22");
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.xss", "2.0.0");
- versions.put("org.apache.tika:tika-bundle", "1.14");
- versions.put("org.apache.tika:tika-core", "1.14");
+ versions.put("org.apache.tika:tika-bundle", "1.17");
+ versions.put("org.apache.tika:tika-core", "1.17");
versions.put("org.attoparser:attoparser", "2.0.4.RELEASE");
- versions.put("org.codehaus.groovy:groovy", "2.4.12");
- versions.put("org.codehaus.groovy:groovy-json", "2.4.12");
- versions.put("org.codehaus.groovy:groovy-templates", "2.4.12");
- versions.put("org.javassist:javassist", "3.21.0-GA");
- versions.put("org.mongodb:mongo-java-driver", "3.5.0");
- versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
- versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
- versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
- versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
+ versions.put("org.codehaus.groovy:groovy", "2.4.13");
+ versions.put("org.codehaus.groovy:groovy-json", "2.4.13");
+ versions.put("org.codehaus.groovy:groovy-templates", "2.4.13");
+ versions.put("org.javassist:javassist", "3.22.0-GA");
+ versions.put("org.mongodb:mongo-java-driver", "3.6.0");
versions.put("org.unbescape:unbescape", "1.1.5.RELEASE");
}
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index facc01c..3783b1e 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -37,25 +37,24 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.16");
- versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
- versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.4");
+ versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.10");
+ versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.8");
versions.put("org.apache.felix:org.apache.felix.http.servlet-api", "1.1.2");
versions.put("org.apache.felix:org.apache.felix.http.whiteboard", "3.0.0");
- versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
+ versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.ds", "2.0.8");
versions.put("org.apache.aries:org.apache.aries.util", "1.1.3");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.api", "1.1.5");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.core", "1.1.7");
versions.put("org.apache.aries.jmx:org.apache.aries.jmx.whiteboard", "1.1.5");
- versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
- versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.2");
- versions.put("org.apache.felix:org.apache.felix.scr", "2.0.12");
+ versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.6");
+ versions.put("org.apache.felix:org.apache.felix.metatype", "1.1.6");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.14");
versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.4");
versions.put("org.ops4j.base:ops4j-base-lang", "1.5.0");
versions.put("org.ops4j.base:ops4j-base-util-property", "1.5.0");
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.3");
- versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
- versions.put("org.slf4j:log4j-over-slf4j", "1.7.25");[# th:each="bundle : ${bundles}"]
+ versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.4");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.4");[# th:each="bundle : ${bundles}"]
versions.put("[(${bundle.groupId})]:[(${bundle.artifactId})]", "[(${bundle.version})]");
[/] }
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 03/03: use
org.apache.felix.framework 5.6.10
Posted by ol...@apache.org.
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 d74e0883c3156aafd999110447b44441c413bca7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Dec 20 21:17:39 2017 +0100
use org.apache.felix.framework 5.6.10
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c0b89f8..9928dee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.2</version>
+ <version>5.6.10</version>
<scope>test</scope>
</dependency>
<!-- testing -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.