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 dcf6300dcb90aa7ff8f5c6ffe87418168242bd86 Author: Oliver Lietz <[email protected]> AuthorDate: Sun Jan 15 06:16:33 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@1778878 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/sling/testing/paxexam/SlingOptions.java | 171 +++++++++++++-------- .../testing/paxexam/SlingVersionResolver.java | 147 +++++++++--------- .../apache/sling/testing/paxexam/package-info.java | 2 +- src/main/resources/templates/SlingOptions.txt | 4 +- 4 files changed, 189 insertions(+), 135 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 f0a6b07..3389f6b 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -132,7 +132,10 @@ public class SlingOptions { mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver), mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver), mavenBundle().groupId("org.apache.commons").artifactId("commons-math").version(versionResolver), - mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver) + mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("json").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:read=sling-readall"}) + .asOption() ); } @@ -178,7 +181,7 @@ public class SlingOptions { slingCommonsClassloader(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.fsclassloader").version(versionResolver), mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver), - mavenBundle().groupId("commons-lang").artifactId("commons-lang").version(versionResolver) + mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver) ); } @@ -252,7 +255,10 @@ public class SlingOptions { webconsole(), slingExtensionDiscovery(), slingExtensionHealthcheck(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.oak").version(versionResolver) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.oak").version(versionResolver), + 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() ); } @@ -283,7 +289,10 @@ public class SlingOptions { slingExtensionDiscovery(), 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) + mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver), + 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() ); } @@ -324,7 +333,10 @@ public class SlingOptions { public static Option slingExtensionI18n() { return composite( sling(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.i18n").version(versionResolver) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.i18n").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.i18n=sling-i18n"}) + .asOption() ); } @@ -338,6 +350,7 @@ public class SlingOptions { public static Option slingExtensionModels() { return composite( sling(), + slingScripting(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.api").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.impl").version(versionResolver) ); @@ -398,7 +411,10 @@ public class SlingOptions { return composite( sling(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.xss").version(versionResolver), - mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver) + mavenBundle().groupId("org.apache.geronimo.bundles").artifactId("commons-httpclient").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.xss=sling-xss"}) + .asOption() ); } @@ -422,7 +438,10 @@ public class SlingOptions { return composite( slingInstaller(), slingJcr(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.provider.jcr").version(versionResolver) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.provider.jcr").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.installer.provider.jcr=sling-jcr-install"}) + .asOption() ); } @@ -431,6 +450,7 @@ public class SlingOptions { webconsole(), sling(), jackrabbitSling(), + jackrabbitOakSling(), tikaSling(), 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), @@ -440,7 +460,14 @@ public class SlingOptions { mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.registration").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.resource").version(versionResolver), 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) + 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.i18n", "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", [...] + .put("whitelist.name", "sling") + .asOption(), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.jcr.resource:observation=sling-readall"}) + .asOption() ); } @@ -462,28 +489,12 @@ public class SlingOptions { ); } - public static Option slingJcrOak() { - return composite( - scr(), - slingJcr(), - jackrabbitSling(), - tikaSling(), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), - 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), - mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jcr").version(versionResolver), - mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver), - mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(versionResolver), - mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver) - ); - } - public static Option slingJcrRepoinit() { return composite( 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) @@ -503,13 +514,13 @@ public class SlingOptions { return composite( slingNosqlCouchbase(), factoryConfiguration("org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config") - .put("provider.roots", "[\"/\"]") + .put("provider.roots", new String[]{"/"}) .asOption(), factoryConfiguration("org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config") .put("bucketName", "sling") - .put("enabled", "true") - .put("couchbaseHosts", "localhost:8091") .put("clientId", "sling-resourceprovider-couchbase") + .put("couchbaseHosts", "localhost:8091") + .put("enabled", true) .asOption() ); } @@ -519,9 +530,9 @@ public class SlingOptions { slingNosqlMongodb(), factoryConfiguration("org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config") .put("collection", "resources") - .put("database", "sling") .put("connectionString", "localhost:27017") - .put("provider.roots", "[\"/\"]") + .put("database", "sling") + .put("provider.roots", new String[]{"/"}) .asOption() ); } @@ -532,79 +543,80 @@ public class SlingOptions { sling(), slingServlets(), slingInstaller(), + slingJcr(), + slingJcrRepoinit(), 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.resourceresolver.impl.observation.OsgiObservationBridge") - .put("enabled", "true") + newConfiguration("org.apache.sling.jcr.repoinit.impl.RepositoryInitializer") + .put("references", new String[]{"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt"}) .asOption(), factoryConfiguration("org.apache.felix.jaas.Configuration.factory") - .put("jaas.ranking", "300") .put("jaas.classname", "org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule") .put("jaas.controlFlag", "optional") + .put("jaas.ranking", 300) .asOption(), factoryConfiguration("org.apache.felix.jaas.Configuration.factory") .put("jaas.classname", "org.apache.jackrabbit.oak.security.authentication.user.LoginModuleImpl") .put("jaas.controlFlag", "required") .asOption(), factoryConfiguration("org.apache.felix.jaas.Configuration.factory") - .put("jaas.ranking", "200") .put("jaas.classname", "org.apache.jackrabbit.oak.security.authentication.token.TokenLoginModule") .put("jaas.controlFlag", "sufficient") + .put("jaas.ranking", 200) .asOption(), newConfiguration("org.apache.felix.jaas.ConfigurationSpi") .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(), newConfiguration("org.apache.jackrabbit.oak.security.user.UserConfigurationImpl") - .put("usersPath", "/home/users") - .put("importBehavior", "besteffort") - .put("defaultDepth", "1") + .put("defaultDepth", 1) .put("groupsPath", "/home/groups") + .put("importBehavior", "besteffort") + .put("usersPath", "/home/users") .asOption(), newConfiguration("org.apache.jackrabbit.oak.security.user.RandomAuthorizableNodeName") - .put("length", "21") + .put("length", 21) .asOption(), newConfiguration("org.apache.jackrabbit.oak.spi.security.user.action.DefaultAuthorizableActionProvider") - .put("groupPrivilegeNames", "[\"jcr:read\"]") - .put("enabledActions", "[\"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction\"]") - .put("userPrivilegeNames", "[\"jcr:all\"]") + .put("enabledActions", new String[]{"org.apache.jackrabbit.oak.spi.security.user.action.AccessControlAction"}) + .put("groupPrivilegeNames", new String[]{"jcr:read"}) + .put("userPrivilegeNames", new String[]{"jcr:all"}) .asOption() ); } public static Option slingLaunchpadOakTar() { return composite( - slingJcrOak(), slingLaunchpadOak(), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver), newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService") - .put("repository.home", "sling/repository") .put("name", "Default NodeStore") - .asOption(), - newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService") - .put("localIndexDir", "sling/repository/index") + .put("repository.home", "sling/repository") .asOption() ); } public static Option slingLaunchpadOakMongo() { return composite( - slingJcrOak(), slingLaunchpadOak(), 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.document.DocumentNodeStoreService") - .put("mongouri", "mongodb://localhost:27017") .put("db", "sling") - .asOption(), - newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService") - .put("localIndexDir", "sling/repository/index") + .put("mongouri", "mongodb://localhost:27017") .asOption() ); } @@ -638,7 +650,10 @@ public class SlingOptions { sling(), 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) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.core").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.scripting.core=sling-scripting"}) + .asOption() ); } @@ -684,12 +699,19 @@ public class SlingOptions { slingJcr(), slingScripting(), slingExtensionI18n(), + slingExtensionModels(), slingExtensionXss(), - slingJcrCompiler(), + slingCommonsCompiler(), slingCommonsFsclassloader(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly").version(versionResolver), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.compiler").version(versionResolver), + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.compiler.java").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.js.provider").version(versionResolver), - mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.rhino").version(versionResolver) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly.models.provider").version(versionResolver), + mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.rhino").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.scripting.sightly.js.provider=sling-scripting"}) + .asOption() ); } @@ -699,7 +721,10 @@ public class SlingOptions { slingScripting(), slingExtensionI18n(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver), - mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver) + mavenBundle().groupId("org.javassist").artifactId("javassist").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.scripting.thymeleaf=sling-scripting"}) + .asOption() ); } @@ -709,7 +734,10 @@ public class SlingOptions { slingJcr(), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.get").version(versionResolver), mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.post").version(versionResolver), - mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver").version(versionResolver) + mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver").version(versionResolver), + factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended") + .put("user.mapping", new String[]{"org.apache.sling.servlets.resolver:scripts=sling-scripting"}) + .asOption() ); } @@ -735,7 +763,24 @@ public class SlingOptions { mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-el_2.2_spec").version(versionResolver), mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-interceptor_1.1_spec").version(versionResolver), mavenBundle().groupId("org.apache.geronimo.specs").artifactId("geronimo-jcdi_1.0_spec").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("org.apache.httpcomponents").artifactId("httpcore-osgi").version(versionResolver), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").version(versionResolver) + ); + } + + public static Option jackrabbitOakSling() { + return composite( + scr(), + jackrabbitSling(), + tikaSling(), + 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), + 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) ); } @@ -754,7 +799,14 @@ public class SlingOptions { slingExtensionEvent(), 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-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"}) + .put("whitelist.name", "composum") + .asOption() ); } @@ -763,10 +815,7 @@ public class SlingOptions { final String repositoryHome = String.format("%s/repository", slingHome); final String localIndexDir = String.format("%s/index", repositoryHome); return composite( - slingJcrOak(), - slingJcrRepoinit(), slingLaunchpadOak(), - paxUrlClasspath(), // for reading repoinit from bundle mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver), newConfiguration("org.apache.felix.http") .put("org.osgi.service.http.port", httpPort) 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 a2d1a1c..4a558a3 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java @@ -34,15 +34,15 @@ public class SlingVersionResolver implements VersionResolver { public static final String SLING_GROUP_ID = "org.apache.sling"; public SlingVersionResolver() { - versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.10"); - versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.6"); - versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.2.2"); + versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.12"); + 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"); 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.2"); - versions.put("org.apache.aries:org.apache.aries.util", "1.1.1"); + 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.6"); + 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"); @@ -51,12 +51,15 @@ public class SlingVersionResolver implements VersionResolver { 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.2"); - versions.put("org.ops4j.pax.url:pax-url-classpath", "2.4.7"); - versions.put("org.ops4j.pax.url:pax-url-commons", "2.4.7"); - versions.put("com.composum.sling.core:composum-sling-core-commons", "1.5.3"); - 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("org.ops4j.pax.url:pax-url-classpath", "2.5.2"); + versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2"); + versions.put("com.composum.sling.core:composum-sling-core-commons", "1.7.0"); + versions.put("com.composum.sling.core:composum-sling-core-console", "1.7.0"); + versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.7.0"); + versions.put("com.composum.sling.core:composum-sling-package-manager", "1.7.0"); + versions.put("com.composum.sling.core:composum-sling-user-management", "1.7.0"); versions.put("com.google.guava:guava", "15.0"); + versions.put("com.h2database:h2-mvstore", "1.4.193"); 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"); @@ -66,11 +69,11 @@ public class SlingVersionResolver implements VersionResolver { 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.servlet:javax.servlet-api", "3.1.0"); - versions.put("org.apache.commons:commons-lang3", "3.4"); + versions.put("org.apache.commons:commons-lang3", "3.5"); 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.jaas", "0.0.4"); - versions.put("org.apache.felix:org.apache.felix.prefs", "1.0.6"); + 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"); versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.2"); versions.put("org.apache.geronimo.bundles:commons-httpclient", "3.1_2"); @@ -82,119 +85,123 @@ public class SlingVersionResolver implements VersionResolver { 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.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.jackrabbit:jackrabbit-api", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-data", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-jcr-rmi", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-spi", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-spi-commons", "2.14.0"); + versions.put("org.apache.jackrabbit:jackrabbit-webdav", "2.14.0"); + versions.put("org.apache.jackrabbit:oak-blob", "1.5.17"); + versions.put("org.apache.jackrabbit:oak-commons", "1.5.17"); + versions.put("org.apache.jackrabbit:oak-core", "1.5.17"); + versions.put("org.apache.jackrabbit:oak-jcr", "1.5.17"); + versions.put("org.apache.jackrabbit:oak-lucene", "1.5.17"); + versions.put("org.apache.jackrabbit:oak-segment", "1.5.17"); + versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.30"); 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"); versions.put("org.apache.sling:org.apache.sling.adapter", "2.1.8"); - versions.put("org.apache.sling:org.apache.sling.api", "2.14.0"); - versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.16"); + versions.put("org.apache.sling:org.apache.sling.api", "2.16.2"); + versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.22"); 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.commons.classloader", "1.3.2"); + versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.3.6"); 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.2"); + versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.4"); 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.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.metrics", "1.2.0"); + 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.5.0"); + versions.put("org.apache.sling:org.apache.sling.commons.scheduler", "2.5.2"); versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.6"); versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4"); - versions.put("org.apache.sling:org.apache.sling.discovery.base", "1.1.4"); - versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.12"); - versions.put("org.apache.sling:org.apache.sling.discovery.impl", "1.2.8"); - versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.8"); + versions.put("org.apache.sling:org.apache.sling.discovery.base", "1.1.6"); + versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.18"); + versions.put("org.apache.sling:org.apache.sling.discovery.impl", "1.2.10"); + versions.put("org.apache.sling:org.apache.sling.discovery.oak", "1.2.16"); 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.1.18"); - versions.put("org.apache.sling:org.apache.sling.engine", "2.4.6"); - versions.put("org.apache.sling:org.apache.sling.event", "4.1.0"); - versions.put("org.apache.sling:org.apache.sling.event.dea", "1.0.4"); + versions.put("org.apache.sling:org.apache.sling.engine", "2.6.6"); + versions.put("org.apache.sling:org.apache.sling.event", "4.2.0"); + versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.0"); 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.0.2"); + versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.0"); versions.put("org.apache.sling:org.apache.sling.fsresource", "1.1.4"); 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"); - versions.put("org.apache.sling:org.apache.sling.i18n", "2.4.10"); - versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.0"); - versions.put("org.apache.sling:org.apache.sling.installer.core", "3.6.8"); + versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.6"); + 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.0"); versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2"); versions.put("org.apache.sling:org.apache.sling.installer.provider.file", "1.1.0"); - versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.18"); + versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.22"); versions.put("org.apache.sling:org.apache.sling.jcr.api", "2.4.0"); - versions.put("org.apache.sling:org.apache.sling.jcr.base", "2.4.0"); + versions.put("org.apache.sling:org.apache.sling.jcr.base", "3.0.0"); 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.1.10"); 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.1.0"); + versions.put("org.apache.sling:org.apache.sling.jcr.oak.server", "1.1.3-SNAPSHOT"); 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.2"); - versions.put("org.apache.sling:org.apache.sling.jcr.resource", "2.8.0"); + versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.2"); + versions.put("org.apache.sling:org.apache.sling.jcr.resource", "2.9.2"); 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"); + versions.put("org.apache.sling:org.apache.sling.models.api", "1.3.2"); + versions.put("org.apache.sling:org.apache.sling.models.impl", "1.3.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.provisioning.model", "1.4.4"); + versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.0"); versions.put("org.apache.sling:org.apache.sling.query", "3.0.0"); - versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.0.4"); + versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.1.0"); 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.resourceresolver", "1.5.8"); + versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.0"); + versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.1.12"); + versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.44"); 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.java", "2.1.2"); versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "2.0.30"); - versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.1.8"); + versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.2"); 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.18"); - versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.10"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.28"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.6"); + versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.18"); + 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.0.0"); - versions.put("org.apache.sling:org.apache.sling.security", "1.0.18"); - versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.2.2"); - versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.14"); - versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.12"); - versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.4"); + versions.put("org.apache.sling:org.apache.sling.security", "1.1.2"); + versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.2.4"); + versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.18"); + versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.14"); + versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.10"); 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.xss", "1.0.8"); - versions.put("org.apache.tika:tika-bundle", "1.13"); - versions.put("org.apache.tika:tika-core", "1.13"); + versions.put("org.apache.sling:org.apache.sling.xss", "1.0.16"); + versions.put("org.apache.tika:tika-bundle", "1.14"); + versions.put("org.apache.tika:tika-core", "1.14"); versions.put("org.codehaus.groovy:groovy", "2.4.7"); versions.put("org.codehaus.groovy:groovy-json", "2.4.7"); versions.put("org.codehaus.groovy:groovy-templates", "2.4.7"); versions.put("org.javassist:javassist", "3.20.0-GA"); - versions.put("org.mongodb:mongo-java-driver", "2.14.3"); + versions.put("org.mongodb:mongo-java-driver", "3.4.1"); } private String key(final String groupId, final String artifactId) { diff --git a/src/main/java/org/apache/sling/testing/paxexam/package-info.java b/src/main/java/org/apache/sling/testing/paxexam/package-info.java index 1d9843a..386718a 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/package-info.java +++ b/src/main/java/org/apache/sling/testing/paxexam/package-info.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -@Version("0.1.0") +@Version("1.0.0") package org.apache.sling.testing.paxexam; import org.osgi.annotation.versioning.Version; diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt index e155a53..9fb6804 100644 --- a/src/main/resources/templates/SlingOptions.txt +++ b/src/main/resources/templates/SlingOptions.txt @@ -109,7 +109,7 @@ public class SlingOptions { [(${fc})]()[# th:unless="${fcsStatus.last}"],[/][/][# th:if="${not #lists.isEmpty(feature.getFeatures())}"][# th:if="${not #lists.isEmpty(feature.getBundles())}"],[/][/][# th:each="bundle,bundlesStatus : ${feature.getBundles()}"] mavenBundle().groupId("[(${bundle.groupId})]").artifactId("[(${bundle.artifactId})]").version(versionResolver)[# th:unless="${bundlesStatus.last}"],[/][/][# th:if="${not #lists.isEmpty(feature.getConfigurations())}"],[/][# th:each="configuration,configurationsStatus : ${feature.getConfigurations()}"] [# th:if="${configuration.isFactory()}"]factoryConfiguration[/][# th:unless="${configuration.isFactory()}"]newConfiguration[/]("[(${configuration.pid})]") [# th:each="entry,entriesStatus : ${configuration.getEntries()}"] - .put("[(${entry.key})]", "[(${entry.value})]")[/] + .put("[(${entry.key})]", [(${entry.value})])[/] .asOption()[# th:unless="${configurationsStatus.last}"],[/][/] ); } @@ -119,9 +119,7 @@ public class SlingOptions { final String repositoryHome = String.format("%s/repository", slingHome); final String localIndexDir = String.format("%s/index", repositoryHome); return composite( - slingJcrOak(), slingLaunchpadOak(), - paxUrlClasspath(), // for reading repoinit from bundle mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver), newConfiguration("org.apache.felix.http") .put("org.osgi.service.http.port", httpPort) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
