You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:20:29 UTC
[sling-org-apache-sling-testing-paxexam] annotated tag
org.apache.sling.testing.paxexam-0.0.4 created (now a5bf296)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change 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.
at a5bf296 (tag)
tagging 35bb3f4948a93a6d867c180b9d1e286aaabcd47b (commit)
by Oliver Lietz
on Fri Mar 17 13:37:54 2017 +0000
- Log -----------------------------------------------------------------
org.apache.sling.testing.paxexam-0.0.4
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new b4440ef SLING-5809 Provide Sling's Launchpad Karaf Features as Options for Pax Exam
new 4689729 SLING-5809 Provide Sling's Launchpad Karaf Features as Options for Pax Exam
new 2d772f6 svn:ignore
new 02cd881 SLING-5809 Provide Sling's Launchpad Karaf Features as Options for Pax Exam
new bbe1212 use latest releases
new 87a9ae8 update SlingOptions and SlingVersionResolver
new fbfd8e2 update SlingVersionResolver (Discovery releases)
new dbee5a3 SLING-5893 Provide a default Launchpad Oak Tar configuration as Option for Pax Exam
new c12e8ad SLING-5894 Provide test support with common functions for use with Pax Exam
new 1063a5c use Sling parent 27
new 1bad247 remove bundle org.apache.felix.http.servlet-api
new 9e41754 update SlingVersionResolver (org.apache.felix.http.jetty)
new fa79743 SLING-5897 Fail the test by default if there are unresolved bundles
new 391bf87 drop launchpad namespace
new aff7d36 drop launchpad namespace
new b40be02 update SlingOptions and SlingVersionResolver
new 39abdbc revert r1753956 (remove bundle org.apache.felix.http.servlet-api)
new 380751e add a constant for Sling’s Maven groupId
new fb18998 change type of versionResolver to SlingVersionResolver to allow setting of versions without prior casting
new 7f2a91e SLING-5898 Point to the alternative repository if specified on the command-line
new d3de728 SLING-5901 Build fails with OOME (Maven Source Plugin 3.0.0)
new 4c43308 SLING-5911 Make non-generated Options self-contained
new 767de66 SLING-5898 Point to the alternative repository if specified on the command-line
new ce0a0c6 add Option testBundle
new 666510f SLING-5912 Add Integration Tests for non-generated Options
new 320e1b4 add org.apache.felix.webconsole.plugins.ds to SlingVersionResolver (relates to SLING-5896)
new b95b3a6 SLING-5897 Fail the test by default if there are unresolved bundles
new 2f179c6 SLING-5893 Provide a default Launchpad Oak Tar configuration as Option for Pax Exam
new cef65d5 use Option failOnUnresolvedBundles in IT, reorder Options alphabetically
new ec99296 add Getting Started
new 8717dcc update
new 675c386 add features and note about versions
new 3299a9d add a constant for Sling’s Maven groupId
new 75c0a68 SLING-5929 Provide Pax URL and Pax URL Classpath as Options for Pax Exam
new d52e72e update SlingOptions (Sling Commons Compiler)
new 5efa6fe update SlingOptions (enable RandomAuthorizableNodeName)
new 352c46c update SlingOptions and SlingVersionResolver (repoinit)
new 9a706c2 use Sling parent 28
new a8c6ee3 change type of versionResolver to SlingVersionResolver to allow setting of versions without prior casting (align template)
new 25b0c23 add paxUrlClasspath() for reading repoinit from bundle
new 9c2bb42 update SlingOptions and SlingVersionResolver (Jackrabbit and Oak, remove all snapshots)
new fb622ce update SlingVersionResolver
new 269c47a [maven-release-plugin] prepare release org.apache.sling.testing.paxexam-0.0.2
new 82b84ca [maven-release-plugin] prepare for next development iteration
new 60e45a3 update SlingOptions and SlingVersionResolver
new 1cae4d5 [maven-release-plugin] prepare release org.apache.sling.testing.paxexam-0.0.2
new cf8038f [maven-release-plugin] prepare for next development iteration
new 1d050e7 SLING-6038 Provide convenient method to set versions from Maven project
new 550c0c9 extend README
new ef0fea4 SLING-6076 Add Maven repository apache-snapshots to base configuration
new 84a4190 Use parent 29
new eb25789 remove version of javax.inject (managed in Sling parent)
new 5e9c008 SLING-6184 Provide JCR repoinit Option
new e32c8c2 SLING-6038 Provide convenient method to set versions from Maven project
new f43852d SLING-6463 Update versions in SlingVersionResolver template
new febcb23 redirect test output to file
new dcf6300 SLING-6464 Update options and versions to latest features
new f6bd96f SLING-6473 - Create a VersionResolver that provides versions from provisioning model files
new 5b43121 SLING-6473 - Create a VersionResolver that provides versions from provisioning model files
new 9acf4f6 SLING-6464 Update options and versions to latest features
new 2da76f4 SLING-6464 Update options and versions to latest features
new ed1d1a8 SLING-6464 Update options and versions to latest features
new 7cb1819 use PathUtils for workingDirectory
new f189308 SLING-6464 Update options and versions to latest features
new aa6de24 SLING-6425 Update Pax Exam to 4.10
new f7e8056 SLING-6464 Update options and versions to latest features
new ebb8b1d SLING-6464 Update options and versions to latest features
new 057e5ed SLING-6473 Create a VersionResolver that provides versions from provisioning model files
new 3bc29d4 use Sling Parent 30
new 4ec7574 use latest releases
new 8f415b9 SLING-6464 Update options and versions to latest features
new 1bf93a2 SLING-6464 Update options and versions to latest features
new c1da8f0 add log4j-over-slf4j (workaround for OAK-5921)
new 09f5f21 SLING-6464 Update options and versions to latest features
new d6d131d SLING-6464 Update options and versions to latest features
new 5347406 SLING-6464 Update options and versions to latest features
new f2f0cbd add Option slingLaunchpadOakMongo with parameters (working directory, HTTP port and Mongo URI)
new 505531a add note about cleaning up sling home when using options without configured working directory (SLING-6653)
new e730cd9 adjust bundles (jsp-api and el-api)
new 24c96a4 use org.apache.felix.framework 5.6.2
new 5a1b7f6 remove Validation
new 2bf470f add missing bundle com.composum.core.pckgmgr to whitelist
new 511ccbf use upcoming releases and releases under vote
new fe05e6f [maven-release-plugin] prepare release org.apache.sling.testing.paxexam-0.0.4
new 35bb3f4 [maven-release-plugin] copy for tag org.apache.sling.testing.paxexam-0.0.4
The 85 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.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-testing-paxexam] 22/39: SLING-6473 Create a
VersionResolver that provides versions from provisioning model files
Posted by ro...@apache.org.
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 057e5ed34966786a62dcea27239860fa3d1d09f6
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 4 13:58:36 2017 +0000
SLING-6473 Create a VersionResolver that provides versions from provisioning model files
remove VersionResolver until matching Options are also provided by provisioning model
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1785487 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 --
.../paxexam/ProvisioningModelVersionResolver.java | 136 ---------------------
.../ProvisioningModelVersionResolverTest.java | 55 ---------
.../testing/paxexam/SlingOptionsTestSupport.java | 2 -
src/test/resources/test-dependencies.txt | 25 ----
5 files changed, 231 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9bb462e..a5a70a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,13 +105,6 @@
<artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.0.0</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
<!-- Apache Felix -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -153,12 +146,6 @@
<version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.13</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
deleted file mode 100644
index 6cc1207..0000000
--- a/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam;
-
-import org.apache.sling.provisioning.model.Artifact;
-import org.apache.sling.provisioning.model.ArtifactGroup;
-import org.apache.sling.provisioning.model.Feature;
-import org.apache.sling.provisioning.model.Model;
-import org.apache.sling.provisioning.model.RunMode;
-import org.apache.sling.provisioning.model.io.ModelReader;
-import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
-import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-/**
- * VersionResolver that reads version information from a sling provisioning file.
- * One use-case is to reference Sling's launchpad, which normally references a
- * (recent) set of compatible bundles, in order to allow running test based on
- * the versioning information from the Sling launchpad's provisioning model.
- */
-public class ProvisioningModelVersionResolver implements VersionResolver {
-
- private final Model model;
-
- /**
- * Adds classifier "slingfeature" and type "txt" to the provided MavenArtifactUrlReference
- * to simplify creation of a VersionResolver based on a slingfeature.
- *
- * @param reference Maven coordinates of a module that provides a slingfeature.
- * @return VersionResolver instance backed by the referenced slingfeature.
- */
- public static VersionResolver fromSlingfeature(MavenArtifactUrlReference reference) {
- final String url = reference.classifier("slingfeature").type("txt").getURL();
- try {
- return new ProvisioningModelVersionResolver(url);
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Constructor to create a VersionResolver instance backed by a provisioning model referenced
- * by the URL represented by the provided String.
- *
- * @param url The String representation of a URL.
- * @throws MalformedURLException If the String representation of the URL is not a valid URL.
- */
- public ProvisioningModelVersionResolver(final String url) throws MalformedURLException {
- this(toUrl(url));
- }
-
- /**
- * Constructor to create a VersionResolver instance backed by a provisioning model referenced
- * by the provided URL object.
- *
- * @param url The URL pointing the the provisioning model file.
- */
- public ProvisioningModelVersionResolver(final URL url) {
- InputStream inputStream = null;
- try {
- inputStream = url.openStream();
- this.model = ModelReader.read(new InputStreamReader(inputStream), url.toExternalForm());
- } catch (IOException e) {
- throw new RuntimeException("Failed to read " + url.toExternalForm(), e);
- } finally {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (IOException e) {
- // silent
- }
- }
- }
- }
-
- private static URL toUrl(final String url) throws MalformedURLException {
- final boolean hasProtocolHandler = System.getProperty("java.protocol.handler.pkgs") != null;
- if (!hasProtocolHandler) {
- // enable org.ops4j.pax.url handlers by default, unless the property is already set
- System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
- }
- try {
- return new URL(url);
- } catch (final MalformedURLException e) {
- if ("unknown protocol: mvn".equals(e.getMessage())) {
- // best effort: present a helpful message in case the mvn protocol handler is missing
- final MalformedURLException exception = new MalformedURLException(e.getMessage()
- + " -> Consider a dependency to org.ops4j.pax.url:pax-url-aether");
- exception.initCause(e);
- throw exception;
- }
- throw e;
- } finally {
- if (!hasProtocolHandler) {
- System.clearProperty("java.protocol.handler.pkgs");
- }
- }
- }
-
- @Override
- public String getVersion(final String groupId, final String artifactId) {
- for (final Feature feature : model.getFeatures()) {
- for (final RunMode runMode : feature.getRunModes()) {
- for (final ArtifactGroup artifacts : runMode.getArtifactGroups()) {
- for (final Artifact artifact : artifacts) {
- if (groupId.equals(artifact.getGroupId()) && artifactId.equals(artifact.getArtifactId())) {
- return artifact.getVersion();
- }
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java b/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java
deleted file mode 100644
index 6529c11..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.testing.paxexam;
-
-import org.junit.Test;
-import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
-
-import static org.apache.sling.testing.paxexam.ProvisioningModelVersionResolver.fromSlingfeature;
-import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.maven;
-
-public class ProvisioningModelVersionResolverTest {
-
- @Test
- public void getVersionFromClasspathResource() throws Exception {
- final VersionResolver versionResolver =
- new ProvisioningModelVersionResolver(getClass().getResource("/test-dependencies.txt"));
- assertVersion("2.6.4", "org.apache.sling", "org.apache.sling.engine", versionResolver);
- assertVersion("2.4.10", "org.apache.sling", "org.apache.sling.servlets.resolver", versionResolver);
- assertVersion("2.1.18", "org.apache.sling", "org.apache.sling.servlets.get", versionResolver);
- assertVersion("2.3.14", "org.apache.sling", "org.apache.sling.servlets.post", versionResolver);
- }
-
- @Test
- public void getVersionFromMavenDependency() throws Exception {
- final VersionResolver versionResolver =
- fromSlingfeature(maven("org.apache.sling", "org.apache.sling.launchpad", "8"));
- assertVersion("2.4.4", "org.apache.sling", "org.apache.sling.engine", versionResolver);
- assertVersion("2.3.8", "org.apache.sling", "org.apache.sling.servlets.resolver", versionResolver);
- assertVersion("2.1.12", "org.apache.sling", "org.apache.sling.servlets.get", versionResolver);
- assertVersion("2.3.8", "org.apache.sling", "org.apache.sling.servlets.post", versionResolver);
- }
-
- private void assertVersion(final String expectedVersion,
- final String groupId, final String artifactId, final VersionResolver versionResolver) {
- final String actualVersion = versionResolver.getVersion(groupId, artifactId);
- assertEquals("Version mismatch for " + groupId + ":" + artifactId, expectedVersion, actualVersion);
- }
-}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
index 13f8b5a..f3dcff2 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
@@ -18,13 +18,11 @@
*/
package org.apache.sling.testing.paxexam;
-
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
public abstract class SlingOptionsTestSupport extends TestSupport {
diff --git a/src/test/resources/test-dependencies.txt b/src/test/resources/test-dependencies.txt
deleted file mode 100644
index fa43db7..0000000
--- a/src/test/resources/test-dependencies.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-[feature name=test]
-# Dependencies
-[artifacts]
- org.apache.sling/org.apache.sling.engine/2.6.4
- org.apache.sling/org.apache.sling.servlets.resolver/2.4.10
- org.apache.sling/org.apache.sling.servlets.get/2.1.18
- org.apache.sling/org.apache.sling.servlets.post/2.3.14
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 06/39: remove version of
javax.inject (managed in Sling parent)
Posted by ro...@apache.org.
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 eb25789f4b0f7a8250f611897cd132a6a70120ff
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Oct 23 16:47:15 2016 +0000
remove version of javax.inject (managed in Sling parent)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1766304 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 166d0a4..d30c388 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,6 @@
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>1</version>
<scope>provided</scope>
</dependency>
<!-- OSGi -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 07/39: SLING-6184 Provide
JCR repoinit Option
Posted by ro...@apache.org.
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 5e9c008bc5fee543444b03c405f464bb0eba8dbe
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Oct 23 17:27:28 2016 +0000
SLING-6184 Provide JCR repoinit Option
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1766306 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/testing/paxexam/SlingOptions.java | 12 ++++++++++++
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 3 +++
2 files changed, 15 insertions(+)
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 0cc1101..f0a6b07 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -479,6 +479,17 @@ 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(),
@@ -753,6 +764,7 @@ public class SlingOptions {
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),
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 44e43ed..a2d1a1c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -151,6 +151,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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.webconsole", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.4");
@@ -162,7 +163,9 @@ public class SlingVersionResolver implements VersionResolver {
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.4");
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");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 04/39: SLING-6076 Add
Maven repository apache-snapshots to base configuration
Posted by ro...@apache.org.
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 ef0fea400d50bd9fb0104b6210b46b9c761b1cba
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Sep 29 14:02:55 2016 +0000
SLING-6076 Add Maven repository apache-snapshots to base configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1762782 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index d8d457a..3080c07 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -33,6 +33,7 @@ import static org.ops4j.pax.exam.CoreOptions.bundle;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.repository;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.when;
@@ -68,6 +69,7 @@ public abstract class TestSupport {
failOnUnresolvedBundles(),
keepCaches(),
localMavenRepo(),
+ repository("https://repository.apache.org/snapshots/").id("apache-snapshots").allowSnapshots(),
CoreOptions.workingDirectory(workingDirectory()),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.paxexam").versionAsInProject()
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 09/39: SLING-6463 Update
versions in SlingVersionResolver template
Posted by ro...@apache.org.
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 f43852dd90324f49c93babe942327ad40e607e73
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Jan 14 17:22:46 2017 +0000
SLING-6463 Update versions in SlingVersionResolver template
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1778801 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/templates/SlingVersionResolver.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index ddf3856..e677763 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -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,8 +51,8 @@ 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");[# th:each="bundle : ${bundles}"]
+ versions.put("org.ops4j.pax.url:pax-url-classpath", "2.5.2");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");[# 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] 05/39: Use parent 29
Posted by ro...@apache.org.
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 84a41909fe5e4ecc729c6c620a30b077a36fd073
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Oct 17 13:28:10 2016 +0000
Use parent 29
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1765279 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 003f8fd..166d0a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>28</version>
+ <version>29</version>
<relativePath />
</parent>
@@ -66,7 +66,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.18.1</version>
<executions>
<execution>
<goals>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 31/39: add Option
slingLaunchpadOakMongo with parameters (working directory,
HTTP port and Mongo URI)
Posted by ro...@apache.org.
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 f2f0cbd70bd7261084fb5448c2ac8153d062bda4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 16 15:30:10 2017 +0000
add Option slingLaunchpadOakMongo with parameters (working directory, HTTP port and Mongo URI)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787205 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 20 ++++++++++++++++++++
src/main/resources/templates/SlingOptions.txt | 20 ++++++++++++++++++++
2 files changed, 40 insertions(+)
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 8c5dc00..c177ac1 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -882,4 +882,24 @@ public class SlingOptions {
);
}
+ public static Option slingLaunchpadOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
+ final String slingHome = String.format("%s/sling", workingDirectory);
+ final String repositoryHome = String.format("%s/repository", slingHome);
+ final String localIndexDir = String.format("%s/index", repositoryHome);
+ return composite(
+ slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
+ mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
+ mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+ .put("localIndexDir", localIndexDir)
+ .asOption(),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService")
+ .put("db", "sling")
+ .put("mongouri", mongouri)
+ .asOption()
+ );
+ }
+
}
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 068b219..4a8f942 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -139,4 +139,24 @@ public class SlingOptions {
);
}
+ public static Option slingLaunchpadOakMongo(final String workingDirectory, final int httpPort, final String mongouri) {
+ final String slingHome = String.format("%s/sling", workingDirectory);
+ final String repositoryHome = String.format("%s/repository", slingHome);
+ final String localIndexDir = String.format("%s/index", repositoryHome);
+ return composite(
+ slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
+ mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
+ mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+ .put("localIndexDir", localIndexDir)
+ .asOption(),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService")
+ .put("db", "sling")
+ .put("mongouri", mongouri)
+ .asOption()
+ );
+ }
+
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 34/39: use
org.apache.felix.framework 5.6.2
Posted by ro...@apache.org.
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 24c96a4b744be763f388f44c910407532ee7c7d2
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 09:48:14 2017 +0000
use org.apache.felix.framework 5.6.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787309 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5406d4c..0714843 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.4.0</version>
+ <version>5.6.2</version>
<scope>test</scope>
</dependency>
<!-- testing -->
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 16/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 ed1d1a8c84fbcd2a56d2c2a0a778cf0d45947f97
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 24 10:23:09 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@1780053 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 6 +++---
.../testing/paxexam/SlingVersionResolver.java | 25 +++++++++++++---------
2 files changed, 18 insertions(+), 13 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 3389f6b..6c8ba7a 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -134,7 +134,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.commons").artifactId("commons-math").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"})
+ .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"})
.asOption()
);
}
@@ -324,7 +324,6 @@ public class SlingOptions {
slingJcr(),
slingScripting(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
);
@@ -553,7 +552,7 @@ public class SlingOptions {
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/repoinit.txt"})
+ .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")
@@ -817,6 +816,7 @@ public class SlingOptions {
return composite(
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.felix.http")
.put("org.osgi.service.http.port", httpPort)
.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 4a558a3..882b17c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -85,6 +85,7 @@ 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.httpcomponents:httpcore-osgi", "4.4.6");
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");
@@ -92,12 +93,12 @@ public class SlingVersionResolver implements VersionResolver {
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:oak-blob", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-core", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-segment", "1.5.18");
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");
@@ -133,9 +134,8 @@ public class SlingVersionResolver implements VersionResolver {
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.fsresource", "1.1.4");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "1.2.2");
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.5.6");
@@ -172,14 +172,14 @@ public class SlingVersionResolver implements VersionResolver {
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.5.8");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
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.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.2.2");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.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.28");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4");
@@ -202,6 +202,11 @@ public class SlingVersionResolver implements VersionResolver {
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", "3.4.1");
+ 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.5.2");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 10/39: redirect test
output to file
Posted by ro...@apache.org.
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 febcb2349381ffe22fefe5a9bc86118f000714dc
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Jan 15 06:06:41 2017 +0000
redirect test output to file
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1778877 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index d30c388..b5b709a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,7 @@
</execution>
</executions>
<configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemProperties>
<property>
<name>bundle.filename</name>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 17/39: use PathUtils for
workingDirectory
Posted by ro...@apache.org.
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 7cb181929ee86eecff6cc946c4becb7fe62d5c46
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Jan 26 20:20:38 2017 +0000
use PathUtils for workingDirectory
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1780473 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/TestSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
index 3080c07..6f056cb 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/TestSupport.java
@@ -27,6 +27,7 @@ import javax.inject.Inject;
import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.util.PathUtils;
import org.osgi.service.cm.ConfigurationAdmin;
import static org.ops4j.pax.exam.CoreOptions.bundle;
@@ -39,7 +40,7 @@ import static org.ops4j.pax.exam.CoreOptions.when;
public abstract class TestSupport {
- private final String workingDirectory = String.format("target/paxexam/%s", getClass().getSimpleName());
+ private final String workingDirectory = String.format("%s/target/paxexam/%s", PathUtils.getBaseDir(), getClass().getSimpleName());
@Inject
protected ConfigurationAdmin configurationAdmin;
--
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/39: SLING-6038 Provide
convenient method to set versions from Maven project
Posted by ro...@apache.org.
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 1d050e7cfaa1e51dcd5fdef172b26883c7519bc0
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Sep 5 19:28:38 2016 +0000
SLING-6038 Provide convenient method to set versions from Maven project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1759346 13f79535-47bb-0310-9956-ffa450edef68
---
.../testing/paxexam/SlingVersionResolver.java | 6 ++++++
.../apache/sling/testing/paxexam/package-info.java | 22 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
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 757e2aa..44e43ed 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -21,6 +21,7 @@ package org.apache.sling.testing.paxexam;
import java.util.HashMap;
import java.util.Map;
+import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
/**
@@ -201,6 +202,11 @@ public class SlingVersionResolver implements VersionResolver {
return versions.put(key(groupId, artifactId), version);
}
+ public String setVersionFromProject(final String groupId, final String artifactId) {
+ final String version = MavenUtils.getArtifactVersion(groupId, artifactId);
+ return versions.put(key(groupId, artifactId), version);
+ }
+
@Override
public String getVersion(final String groupId, final String artifactId) {
return versions.get(key(groupId, 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
new file mode 100644
index 0000000..1d9843a
--- /dev/null
+++ b/src/main/java/org/apache/sling/testing/paxexam/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+@Version("0.1.0")
+package org.apache.sling.testing.paxexam;
+
+import org.osgi.annotation.versioning.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] 20/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 f7e805623c7594ebccc86f71a097c41713dd581d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 31 22:42:24 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@1781184 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 17b932e..4164de3 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -160,7 +160,7 @@ public class SlingVersionResolver implements VersionResolver {
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.6");
+ versions.put("org.apache.sling:org.apache.sling.jcr.webdav", "2.3.7-SNAPSHOT");
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");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 36/39: add missing bundle
com.composum.core.pckgmgr to whitelist
Posted by ro...@apache.org.
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 2bf470fe51e16e7d031a8af122f7a915744b0ea7
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 12:43:29 2017 +0000
add missing bundle com.composum.core.pckgmgr to whitelist
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787345 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 9be8b5e..66828ce 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -840,7 +840,7 @@ public class SlingOptions {
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.bundles", new String[]{"com.composum.core.commons", "com.composum.core.pckgmgr"})
.put("whitelist.name", "composum")
.asOption()
);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 33/39: adjust bundles
(jsp-api and el-api)
Posted by ro...@apache.org.
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 e730cd906cfc31230d6291a5fb342fef68abaef1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 09:08:50 2017 +0000
adjust bundles (jsp-api and el-api)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787306 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 4 ++--
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 4 ++--
src/main/resources/templates/SlingOptions.txt | 4 ++--
src/main/resources/templates/SlingVersionResolver.txt | 4 ++--
4 files changed, 8 insertions(+), 8 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 c177ac1..86a9f26 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-api").version(versionResolver),
config()
);
}
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 2ee4f75..0ba19ea 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 4a8f942..e8b0535 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-api").version(versionResolver),
config()
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 7fe7de4..8c0d153 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
--
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/39: extend README
Posted by ro...@apache.org.
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 550c0c9bcd762f8172b04a5bc899b05324e6747c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Sep 21 20:14:24 2016 +0000
extend README
* add section for required dependencies
* add section for depends-maven-plugin
* add note for SlingVersionResolver#setVersionFromProject(…)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1761806 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
diff --git a/README.md b/README.md
index 4610a42..1d1a739 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,50 @@ Apache Sling Testing Pax Exam
Getting Started
---------------
+Add required dependencies:
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.testing.paxexam</artifactId>
+ <version>${org.apache.sling.testing.paxexam.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-cm</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-forked</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>${org.ops4j.pax.exam.version}</version>
+ <scope>test</scope>
+ </dependency>
+
Configure the build artifact (*bundle*) to use in integration testing in `pom.xml`:
<plugin>
@@ -39,6 +83,21 @@ Configure the build artifact (*bundle*) to use in integration testing in `pom.xm
</configuration>
</plugin>
+Add `depends-maven-plugin` when using `TestSupport#baseConfiguration()` or `SlingVersionResolver#setVersionFromProject(…)` (see below):
+
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
Create a test class (extend `TestSupport` to use helper methods and `Option`s) and provide a *Configuration* (`Option[]`) for Pax Exam:
@Configuration
@@ -66,3 +125,7 @@ Create a test class (extend `TestSupport` to use helper methods and `Option`s) a
**Overriding (or adding) versions:**
SlingOptions.versionResolver.setVersion(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server", "1.1.0");
+
+using a version from project (`pom.xml`):
+
+ SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server");
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 25/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 8f415b9eb87587e02f68f2c5e9cc4e63898eb772
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 9 13:43:40 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@1786168 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 39 +++++++++++++-
.../testing/paxexam/SlingVersionResolver.java | 59 ++++++++++++----------
2 files changed, 70 insertions(+), 28 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 654de10..023e642 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -182,6 +182,7 @@ public class SlingOptions {
webconsole(),
slingCommonsClassloader(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.fsclassloader").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.commons.osgi").version(versionResolver),
mavenBundle().groupId("commons-io").artifactId("commons-io").version(versionResolver),
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").version(versionResolver)
);
@@ -381,6 +382,16 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionResourcePresence() {
+ return composite(
+ sling(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resource.presence").version(versionResolver),
+ factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+ .put("user.mapping", new String[]{"org.apache.sling.resource.presence=sling-readall"})
+ .asOption()
+ );
+ }
+
public static Option slingExtensionResourcemerger() {
return composite(
sling(),
@@ -417,6 +428,19 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionValidation() {
+ return composite(
+ sling(),
+ slingExtensionI18n(),
+ 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),
+ mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").version(versionResolver),
+ factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
+ .put("user.mapping", new String[]{"org.apache.sling.validation.core=sling-validation"})
+ .asOption()
+ );
+ }
+
public static Option slingExtensionXss() {
return composite(
sling(),
@@ -437,6 +461,14 @@ public class SlingOptions {
);
}
+ public static Option slingInstallerHealthcheck() {
+ return composite(
+ slingInstaller(),
+ slingExtensionHealthcheck(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.hc").version(versionResolver)
+ );
+ }
+
public static Option slingInstallerProviderFile() {
return composite(
slingInstaller(),
@@ -472,7 +504,7 @@ 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.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.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.name", "sling")
.asOption(),
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
@@ -563,7 +595,7 @@ public class SlingOptions {
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 [...]
+ .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")
@@ -731,6 +763,9 @@ public class SlingOptions {
slingScripting(),
slingExtensionI18n(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
+ mavenBundle().groupId("org.attoparser").artifactId("attoparser").version(versionResolver),
+ mavenBundle().groupId("org.unbescape").artifactId("unbescape").version(versionResolver),
+ mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.ognl").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"})
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 93eb5e7..4ac27c2 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -36,20 +36,20 @@ public class SlingVersionResolver implements VersionResolver {
public SlingVersionResolver() {
versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
versions.put("javax.el:javax.el-api", "2.2.1");
- versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.12");
+ versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
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.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
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.6");
- versions.put("org.apache.felix:org.apache.felix.webconsole", "4.2.16");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.8");
+ versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.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.2");
@@ -67,18 +67,18 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("commons-fileupload:commons-fileupload", "1.3.2");
versions.put("commons-io:commons-io", "2.5");
versions.put("commons-lang:commons-lang", "2.6");
- versions.put("io.dropwizard.metrics:metrics-core", "3.1.2");
+ versions.put("io.dropwizard.metrics:metrics-core", "3.2.0");
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.6");
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-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", "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");
- versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.2");
+ versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.4");
versions.put("org.apache.geronimo.bundles:commons-httpclient", "3.1_2");
versions.put("org.apache.geronimo.bundles:json", "20090211_1");
versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.0");
@@ -102,6 +102,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.jackrabbit:oak-lucene", "1.6.0");
versions.put("org.apache.jackrabbit:oak-segment", "1.6.0");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.30");
+ versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2_1");
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");
@@ -111,9 +112,9 @@ public class SlingVersionResolver implements VersionResolver {
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.4.1-SNAPSHOT");
+ 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.4");
+ versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.6");
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.2.0");
@@ -129,23 +130,24 @@ public class SlingVersionResolver implements VersionResolver {
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.4");
+ versions.put("org.apache.sling:org.apache.sling.distribution.core", "0.2.6");
versions.put("org.apache.sling:org.apache.sling.engine", "2.6.6");
- versions.put("org.apache.sling:org.apache.sling.event", "4.2.1-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.event", "4.2.2");
+ 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.fsresource", "1.2.2");
- 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.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.5.7-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.8");
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.6");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
+ versions.put("org.apache.sling:org.apache.sling.installer.hc", "1.0.0");
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.23-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.24");
versions.put("org.apache.sling:org.apache.sling.jcr.api", "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");
@@ -174,22 +176,23 @@ public class SlingVersionResolver implements VersionResolver {
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.resource.inventory", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.18");
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.45-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.46");
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", "2.0.30");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.7-SNAPSHOT");
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.30");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly", "1.0.32");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.8");
- versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.19-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.20");
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.scripting.thymeleaf", "1.0.1-SNAPSHOT");
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.22");
@@ -197,19 +200,23 @@ public class SlingVersionResolver implements VersionResolver {
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.17-SNAPSHOT");
+ 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.18");
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.attoparser:attoparser", "2.0.3.RELEASE");
+ versions.put("org.codehaus.groovy:groovy", "2.4.9");
+ versions.put("org.codehaus.groovy:groovy-json", "2.4.9");
+ versions.put("org.codehaus.groovy:groovy-templates", "2.4.9");
+ versions.put("org.javassist:javassist", "3.21.0-GA");
versions.put("org.mongodb:mongo-java-driver", "3.4.2");
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.5.2");
versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
+ versions.put("org.unbescape:unbescape", "1.1.4.RELEASE");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 38/39:
[maven-release-plugin] prepare release
org.apache.sling.testing.paxexam-0.0.4
Posted by ro...@apache.org.
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 fe05e6f41f2d36fe54057798ddf3567c4f988716
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 13:37:40 2017 +0000
[maven-release-plugin] prepare release org.apache.sling.testing.paxexam-0.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787375 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0714843..b5eae3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>0.0.3-SNAPSHOT</version>
+ <version>0.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing PaxExam</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.paxexam-0.0.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.paxexam-0.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.paxexam-0.0.4</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 18/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 f18930897626a086ef13417b737bb80b3a56a61c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 31 21:31:12 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@1781172 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 11 +++++++++++
.../testing/paxexam/SlingVersionResolver.java | 22 +++++++++++++---------
src/main/resources/templates/SlingOptions.txt | 3 +++
.../resources/templates/SlingVersionResolver.txt | 2 ++
4 files changed, 29 insertions(+), 9 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 6c8ba7a..654de10 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -47,6 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
+ mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").version(versionResolver),
+ mavenBundle().groupId("javax.el").artifactId("javax.el-api").version(versionResolver),
config()
);
}
@@ -355,6 +357,15 @@ public class SlingOptions {
);
}
+ public static Option slingExtensionPipes() {
+ return composite(
+ sling(),
+ jackrabbitSling(),
+ slingExtensionQuery(),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver)
+ );
+ }
+
public static Option slingExtensionQuery() {
return composite(
sling(),
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 882b17c..17b932e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,6 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
+ versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
+ versions.put("javax.el:javax.el-api", "2.2.1");
versions.put("org.apache.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");
@@ -68,6 +70,7 @@ public class SlingVersionResolver implements VersionResolver {
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.6");
versions.put("javax.servlet:javax.servlet-api", "3.1.0");
versions.put("org.apache.commons:commons-lang3", "3.5");
versions.put("org.apache.commons:commons-math", "2.2");
@@ -104,7 +107,7 @@ public class SlingVersionResolver implements VersionResolver {
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.16.2");
- versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.22");
+ versions.put("org.apache.sling:org.apache.sling.auth.core", "1.3.24");
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");
@@ -129,8 +132,8 @@ public class SlingVersionResolver implements VersionResolver {
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.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.event", "4.2.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.1-SNAPSHOT");
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");
@@ -138,18 +141,18 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
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.6");
+ versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.7-SNAPSHOT");
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.22");
+ versions.put("org.apache.sling:org.apache.sling.installer.provider.jcr", "3.1.23-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.jcr.api", "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.davex", "1.3.7-SNAPSHOT");
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.3-SNAPSHOT");
@@ -157,7 +160,7 @@ public class SlingVersionResolver implements VersionResolver {
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.jcr.webdav", "2.3.6");
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");
@@ -167,6 +170,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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.1.0");
@@ -175,11 +179,11 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
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.core", "2.0.45-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.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.2.4");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.7-SNAPSHOT");
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.28");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 9fb6804..288890a 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -47,6 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
+ mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").version(versionResolver),
+ mavenBundle().groupId("javax.el").artifactId("javax.el-api").version(versionResolver),
config()
);
}
@@ -121,6 +123,7 @@ public class SlingOptions {
return composite(
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.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index e677763..3bf0e4b 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,6 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
+ versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
+ versions.put("javax.el:javax.el-api", "2.2.1");
versions.put("org.apache.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");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 14/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 9acf4f6ca3a6d632840bcda211fc328c013d0cb8
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 23 14:25:22 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@1779933 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 5 +-
.../testing/paxexam/SlingVersionResolver.java | 176 ++++++++++++++++++++-
2 files changed, 174 insertions(+), 7 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 3389f6b..4eac03c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -134,7 +134,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.commons").artifactId("commons-math").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"})
+ .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"})
.asOption()
);
}
@@ -324,7 +324,6 @@ public class SlingOptions {
slingJcr(),
slingScripting(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
- mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
);
@@ -553,7 +552,7 @@ public class SlingOptions {
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/repoinit.txt"})
+ .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")
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 4a558a3..bb312a5 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -60,6 +60,7 @@ public class SlingVersionResolver implements VersionResolver {
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("com.sun.mail:javax.mail", "1.5.6");
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");
@@ -68,7 +69,9 @@ public class SlingVersionResolver implements VersionResolver {
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.6");
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.5");
versions.put("org.apache.commons:commons-math", "2.2");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
@@ -85,6 +88,7 @@ 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.httpcomponents:httpcore-osgi", "4.4.6");
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");
@@ -113,6 +117,8 @@ public class SlingVersionResolver implements VersionResolver {
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.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.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");
@@ -133,9 +139,8 @@ public class SlingVersionResolver implements VersionResolver {
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.fsresource", "1.1.4");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "1.2.2");
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.5.6");
@@ -172,14 +177,15 @@ public class SlingVersionResolver implements VersionResolver {
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.5.8");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
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.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.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.2.2");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.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.28");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4");
@@ -194,7 +200,10 @@ public class SlingVersionResolver implements VersionResolver {
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.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.16");
+ versions.put("org.apache.sling.samples:org.apache.sling.samples.fling", "0.0.1-SNAPSHOT");
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");
@@ -202,6 +211,165 @@ public class SlingVersionResolver implements VersionResolver {
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", "3.4.1");
+ 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.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");
+ versions.put("commons-io:commons-io", "2.5");
+ versions.put("commons-lang:commons-lang", "2.6");
+ 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.servlet:javax.servlet-api", "3.1.0");
+ 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.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");
+ versions.put("org.apache.geronimo.bundles:json", "20090211_1");
+ versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.0");
+ versions.put("org.apache.geronimo.specs:geronimo-el_2.2_spec", "1.0.4");
+ 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.2");
+ versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
+ versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.6");
+ 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.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.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.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.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.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.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.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.2.0");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "1.2.2");
+ versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
+ 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.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.22");
+ versions.put("org.apache.sling:org.apache.sling.jcr.api", "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.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.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.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.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.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.5.12");
+ 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.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.2.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.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.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.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", "3.4.1");
+ 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.5.2");
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 24/39: use latest releases
Posted by ro...@apache.org.
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 4ec7574c4ccca1dc1090fd2bdb778b8a23389102
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 9 13:41:48 2017 +0000
use latest releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786167 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/templates/SlingVersionResolver.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 3bf0e4b..1e68c13 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -36,20 +36,20 @@ public class SlingVersionResolver implements VersionResolver {
public SlingVersionResolver() {
versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
versions.put("javax.el:javax.el-api", "2.2.1");
- versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.12");
+ versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
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.felix:org.apache.felix.webconsole.plugins.ds", "2.0.6");
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.6");
- versions.put("org.apache.felix:org.apache.felix.webconsole", "4.2.16");
+ versions.put("org.apache.felix:org.apache.felix.scr", "2.0.8");
+ versions.put("org.apache.felix:org.apache.felix.webconsole", "4.3.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.2");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 08/39: SLING-6038 Provide
convenient method to set versions from Maven project
Posted by ro...@apache.org.
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 e32c8c28502e200703f67110c44cb51ca9e8ff3e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Jan 13 12:48:54 2017 +0000
SLING-6038 Provide convenient method to set versions from Maven project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1778574 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/templates/SlingVersionResolver.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index f3a7bef..ddf3856 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -21,6 +21,7 @@ package org.apache.sling.testing.paxexam;
import java.util.HashMap;
import java.util.Map;
+import org.ops4j.pax.exam.MavenUtils;
import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
/**
@@ -63,6 +64,11 @@ public class SlingVersionResolver implements VersionResolver {
return versions.put(key(groupId, artifactId), version);
}
+ public String setVersionFromProject(final String groupId, final String artifactId) {
+ final String version = MavenUtils.getArtifactVersion(groupId, artifactId);
+ return versions.put(key(groupId, artifactId), version);
+ }
+
@Override
public String getVersion(final String groupId, final String artifactId) {
return versions.get(key(groupId, artifactId));
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 27/39: add
log4j-over-slf4j (workaround for OAK-5921)
Posted by ro...@apache.org.
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 c1da8f0f251d7e461b812c9456274f24e2f5608b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 10 12:08:10 2017 +0000
add log4j-over-slf4j (workaround for OAK-5921)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786329 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 3 ++-
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 1 +
src/main/resources/templates/SlingOptions.txt | 3 ++-
src/main/resources/templates/SlingVersionResolver.txt | 3 ++-
4 files changed, 7 insertions(+), 3 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 21482d7..e843ceb 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -872,7 +872,8 @@ public class SlingOptions {
.asOption(),
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
.put("localIndexDir", localIndexDir)
- .asOption()
+ .asOption(),
+ mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver) // OAK-5921
);
}
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 b83ac18..67e49e5 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -55,6 +55,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.ops4j.pax.swissbox:pax-swissbox-property", "1.8.2");
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.24");
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");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 5e08f65..b135f7f 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -133,7 +133,8 @@ public class SlingOptions {
.asOption(),
newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
.put("localIndexDir", localIndexDir)
- .asOption()
+ .asOption(),
+ mavenBundle().groupId("org.slf4j").artifactId("log4j-over-slf4j").version(versionResolver) // OAK-5921
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 1e68c13..7956e98 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -54,7 +54,8 @@ public class SlingVersionResolver implements VersionResolver {
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.5.2");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");[# th:each="bundle : ${bundles}"]
+ versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
+ versions.put("org.slf4j:log4j-over-slf4j", "1.7.24");[# 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] 29/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 d6d131df7d4166c8296a56d47268439dfc27755e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 10 20:05:11 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@1786426 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/testing/paxexam/SlingOptions.java | 17 +++++++++++------
.../sling/testing/paxexam/SlingVersionResolver.java | 4 ++--
src/main/resources/templates/SlingOptions.txt | 1 +
3 files changed, 14 insertions(+), 8 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 e843ceb..8c5dc00 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").version(versionResolver),
- mavenBundle().groupId("javax.el").artifactId("javax.el-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
config()
);
}
@@ -615,9 +615,6 @@ public class SlingOptions {
.put("jaas.configProviderName", "FelixJaasProvider")
.put("jaas.defaultRealmName", "jackrabbit.oak")
.asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
- .put("localIndexDir", "sling/repository/index")
- .asOption(),
newConfiguration("org.apache.jackrabbit.oak.security.authentication.AuthenticationConfigurationImpl")
.put("org.apache.jackrabbit.oak.authentication.configSpiName", "FelixJaasProvider")
.asOption(),
@@ -641,8 +638,12 @@ public class SlingOptions {
public static Option slingLaunchpadOakTar() {
return composite(
slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+ .put("localIndexDir", "sling/repository/index")
+ .asOption(),
newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("name", "Default NodeStore")
.put("repository.home", "sling/repository")
@@ -653,9 +654,13 @@ public class SlingOptions {
public static Option slingLaunchpadOakMongo() {
return composite(
slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.mongodb").artifactId("mongo-java-driver").version(versionResolver),
mavenBundle().groupId("com.h2database").artifactId("h2-mvstore").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
+ newConfiguration("org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService")
+ .put("localIndexDir", "sling/repository/index")
+ .asOption(),
newConfiguration("org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService")
.put("db", "sling")
.put("mongouri", "mongodb://localhost:27017")
@@ -823,7 +828,6 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-jcr").version(versionResolver),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("com.google.guava").artifactId("guava").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.jaas").version(versionResolver)
);
@@ -861,6 +865,7 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
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 67e49e5..329bade 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
- versions.put("javax.el:javax.el-api", "2.2.1");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 79b308f..068b219 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -122,6 +122,7 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-lucene").version(versionResolver),
mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 26/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 1bf93a2cc4269f2357ff20035f8b3612c4fdfe36
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 9 19:27:53 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@1786226 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/testing/paxexam/SlingOptions.java | 8 ++++----
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 14 +++++++-------
src/main/resources/templates/SlingOptions.txt | 4 ++--
3 files changed, 13 insertions(+), 13 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 023e642..21482d7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -641,9 +641,9 @@ public class SlingOptions {
public static Option slingLaunchpadOakTar() {
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("name", "Default NodeStore")
.put("repository.home", "sling/repository")
.asOption()
@@ -861,12 +861,12 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
.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 4ac27c2..b83ac18 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -95,12 +95,12 @@ public class SlingVersionResolver implements VersionResolver {
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.6.0");
- versions.put("org.apache.jackrabbit:oak-commons", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-core", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.6.0");
- versions.put("org.apache.jackrabbit:oak-segment", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-core", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.6.1");
+ versions.put("org.apache.jackrabbit:oak-segment-tar", "1.6.1");
versions.put("org.apache.jackrabbit.vault:org.apache.jackrabbit.vault", "3.1.30");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.ognl", "3.2_1");
versions.put("org.apache.servicemix.bundles:org.apache.servicemix.bundles.rhino", "1.7.7.1_1");
@@ -158,7 +158,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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.1.2");
+ versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.3-SNAPSHOT");
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.8");
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index 288890a..5e08f65 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -122,12 +122,12 @@ public class SlingOptions {
final String localIndexDir = String.format("%s/index", repositoryHome);
return composite(
slingLaunchpadOak(),
- mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment").version(versionResolver),
+ mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-segment-tar").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jcr.oak.server").version(versionResolver),
newConfiguration("org.apache.felix.http")
.put("org.osgi.service.http.port", httpPort)
.asOption(),
- newConfiguration("org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStoreService")
+ newConfiguration("org.apache.jackrabbit.oak.segment.SegmentNodeStoreService")
.put("repository.home", repositoryHome)
.put("name", "Default NodeStore")
.asOption(),
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 30/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 5347406ec9982795700d2b254e7287527153a953
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 13 17:14:41 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@1786736 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/testing/paxexam/SlingVersionResolver.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 329bade..2ee4f75 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -159,7 +159,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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.1.3-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.jcr.repoinit", "1.1.4");
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.8");
@@ -179,7 +179,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.18");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.20");
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.46");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 11/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 <ol...@apache.org>
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
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 23/39: use Sling Parent 30
Posted by ro...@apache.org.
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 3bc29d410fff79a023e9f0c6b05566fc37e5ea32
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 6 10:22:30 2017 +0000
use Sling Parent 30
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1785621 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a5a70a3..5406d4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>29</version>
+ <version>30</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] 39/39:
[maven-release-plugin] copy for tag org.apache.sling.testing.paxexam-0.0.4
Posted by ro...@apache.org.
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 35bb3f4948a93a6d867c180b9d1e286aaabcd47b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 13:37:54 2017 +0000
[maven-release-plugin] copy for tag org.apache.sling.testing.paxexam-0.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.paxexam-0.0.4@1787377 13f79535-47bb-0310-9956-ffa450edef68
--
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/39:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
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 cf8038fa7a96c014928104238d3c67efbc0a5a80
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Aug 14 07:20:53 2016 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1756304 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f216c3b..003f8fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>0.0.2</version>
+ <version>0.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Testing PaxExam</name>
@@ -43,9 +43,9 @@
</properties>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.paxexam-0.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.paxexam-0.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.paxexam-0.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/testing/org.apache.sling.testing.paxexam</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 35/39: remove Validation
Posted by ro...@apache.org.
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 5a1b7f6367a32d49f8dfaa9bcb70909356864314
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 12:34:55 2017 +0000
remove Validation
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787339 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/testing/paxexam/SlingOptions.java | 13 -------------
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 2 --
2 files changed, 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 86a9f26..9be8b5e 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -428,19 +428,6 @@ public class SlingOptions {
);
}
- public static Option slingExtensionValidation() {
- return composite(
- sling(),
- slingExtensionI18n(),
- 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),
- mavenBundle().groupId("org.apache.commons").artifactId("commons-collections4").version(versionResolver),
- factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
- .put("user.mapping", new String[]{"org.apache.sling.validation.core=sling-validation"})
- .asOption()
- );
- }
-
public static Option slingExtensionXss() {
return composite(
sling(),
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 0ba19ea..97ea99c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -201,8 +201,6 @@ public class SlingVersionResolver implements VersionResolver {
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.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.18");
versions.put("org.apache.tika:tika-bundle", "1.14");
versions.put("org.apache.tika:tika-core", "1.14");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 37/39: use upcoming
releases and releases under vote
Posted by ro...@apache.org.
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 511ccbf0e4b738d531d79de89dc3e6be0a2e25ed
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 17 12:54:15 2017 +0000
use upcoming releases and releases under vote
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787350 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingVersionResolver.java | 14 +++++++-------
src/main/resources/templates/SlingVersionResolver.txt | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
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 97ea99c..4f1565c 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
+ 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.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
@@ -157,14 +157,14 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.8");
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.3-SNAPSHOT");
+ 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", "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.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.1.1-SNAPSHOT");
+ 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.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");
@@ -177,7 +177,7 @@ public class SlingVersionResolver implements VersionResolver {
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.resource.inventory", "1.0.6");
- versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.2");
versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.20");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.0");
@@ -186,14 +186,14 @@ public class SlingVersionResolver implements VersionResolver {
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", "2.0.30");
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.7-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.3.0");
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.32");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.20");
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.1-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.0");
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.22");
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 8c0d153..968228b 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("org.apache.sling:org.apache.sling.scripting.jsp-api", "1.0.0-SNAPSHOT");
- versions.put("org.apache.sling:org.apache.sling.scripting.el-api", "1.0.0-SNAPSHOT");
+ 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.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 21/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 ebb8b1dc43d3ff31bad1068a81ac0bce5ab34e9f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Feb 23 15:31:30 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@1784156 13f79535-47bb-0310-9956-ffa450edef68
---
.../testing/paxexam/SlingVersionResolver.java | 47 +++++++++++-----------
1 file changed, 23 insertions(+), 24 deletions(-)
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 4164de3..93eb5e7 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -75,7 +75,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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");
versions.put("org.apache.felix:org.apache.felix.webconsole.plugins.packageadmin", "1.0.2");
@@ -86,8 +86,7 @@ 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.2");
- versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
+ 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.0");
versions.put("org.apache.jackrabbit:jackrabbit-data", "2.14.0");
@@ -96,12 +95,12 @@ public class SlingVersionResolver implements VersionResolver {
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.18");
- versions.put("org.apache.jackrabbit:oak-commons", "1.5.18");
- versions.put("org.apache.jackrabbit:oak-core", "1.5.18");
- versions.put("org.apache.jackrabbit:oak-jcr", "1.5.18");
- versions.put("org.apache.jackrabbit:oak-lucene", "1.5.18");
- versions.put("org.apache.jackrabbit:oak-segment", "1.5.18");
+ versions.put("org.apache.jackrabbit:oak-blob", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-commons", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-core", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-jcr", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-lucene", "1.6.0");
+ versions.put("org.apache.jackrabbit:oak-segment", "1.6.0");
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");
@@ -112,7 +111,7 @@ public class SlingVersionResolver implements VersionResolver {
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.6");
+ versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.1-SNAPSHOT");
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.4");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
@@ -130,7 +129,7 @@ public class SlingVersionResolver implements VersionResolver {
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.distribution.core", "0.2.4");
versions.put("org.apache.sling:org.apache.sling.engine", "2.6.6");
versions.put("org.apache.sling:org.apache.sling.event", "4.2.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.1-SNAPSHOT");
@@ -138,12 +137,12 @@ public class SlingVersionResolver implements VersionResolver {
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.fsresource", "1.2.2");
- versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
+ versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.5-SNAPSHOT");
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.7-SNAPSHOT");
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.core", "3.8.6");
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.23-SNAPSHOT");
@@ -152,7 +151,7 @@ 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.1.10");
- versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.7-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.jcr.davex", "1.3.8");
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.3-SNAPSHOT");
@@ -160,7 +159,7 @@ public class SlingVersionResolver implements VersionResolver {
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.7-SNAPSHOT");
+ 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.1.1-SNAPSHOT");
versions.put("org.apache.sling:org.apache.sling.launchpad.content", "2.0.8");
@@ -174,8 +173,8 @@ public class SlingVersionResolver implements VersionResolver {
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.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.resource.inventory", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.2");
versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.12");
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");
@@ -185,27 +184,27 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.scripting.javascript", "2.0.30");
versions.put("org.apache.sling:org.apache.sling.scripting.jsp", "2.2.7-SNAPSHOT");
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.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", "1.0.30");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.6");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler.java", "1.0.8");
+ versions.put("org.apache.sling:org.apache.sling.scripting.sightly.js.provider", "1.0.19-SNAPSHOT");
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.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.get", "2.1.22");
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.16");
+ versions.put("org.apache.sling:org.apache.sling.xss", "1.0.17-SNAPSHOT");
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", "3.4.1");
+ versions.put("org.mongodb:mongo-java-driver", "3.4.2");
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");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 28/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 09f5f21c8b80f923ca328d7716ff852292b33155
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Mar 10 19:09:42 2017 +0000
SLING-6464 Update options and versions to latest features
use Apache Tomcat 6.0.14 JSP and EL API wrappers
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1786421 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/templates/SlingOptions.txt | 4 ++--
src/main/resources/templates/SlingVersionResolver.txt | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/SlingOptions.txt b/src/main/resources/templates/SlingOptions.txt
index b135f7f..79b308f 100644
--- a/src/main/resources/templates/SlingOptions.txt
+++ b/src/main/resources/templates/SlingOptions.txt
@@ -47,8 +47,8 @@ public class SlingOptions {
return composite(
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.jetty").version(versionResolver),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version(versionResolver),
- mavenBundle().groupId("javax.servlet.jsp").artifactId("javax.servlet.jsp-api").version(versionResolver),
- mavenBundle().groupId("javax.el").artifactId("javax.el-api").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.jsp-wrapper").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.el-wrapper").version(versionResolver),
config()
);
}
diff --git a/src/main/resources/templates/SlingVersionResolver.txt b/src/main/resources/templates/SlingVersionResolver.txt
index 7956e98..7fe7de4 100644
--- a/src/main/resources/templates/SlingVersionResolver.txt
+++ b/src/main/resources/templates/SlingVersionResolver.txt
@@ -34,8 +34,8 @@ public class SlingVersionResolver implements VersionResolver {
public static final String SLING_GROUP_ID = "org.apache.sling";
public SlingVersionResolver() {
- versions.put("javax.servlet.jsp:javax.servlet.jsp-api", "2.2.1");
- versions.put("javax.el:javax.el-api", "2.2.1");
+ versions.put("org.apache.sling:org.apache.sling.scripting.jsp-wrapper", "1.0.0-SNAPSHOT");
+ versions.put("org.apache.sling:org.apache.sling.scripting.el-wrapper", "1.0.0-SNAPSHOT");
versions.put("org.apache.felix:org.apache.felix.configadmin", "1.8.14");
versions.put("org.apache.felix:org.apache.felix.eventadmin", "1.4.8");
versions.put("org.apache.felix:org.apache.felix.http.jetty", "3.4.2");
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 13/39: SLING-6473 - Create
a VersionResolver that provides versions from provisioning model files
Posted by ro...@apache.org.
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 5b43121f51425e9d312e462db36a9c7d6c4ff277
Author: Julian Sedding <js...@apache.org>
AuthorDate: Tue Jan 17 16:26:04 2017 +0000
SLING-6473 - Create a VersionResolver that provides versions from provisioning model files
- fix oversights: rat warning and make provisioning model dependency optional
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1779207 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 ++-
.../sling/testing/paxexam/SlingOptionsTestSupport.java | 1 +
src/test/resources/test-dependencies.txt | 18 ++++++++++++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 36b8580..2ab6026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,8 +108,9 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.provisioning.model</artifactId>
- <version>1.8.0</version>
+ <version>1.0.0</version>
<scope>provided</scope>
+ <optional>true</optional>
</dependency>
<!-- Apache Felix -->
<dependency>
diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
index d0e08b6..13f8b5a 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
@@ -24,6 +24,7 @@ import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.keepCaches;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
public abstract class SlingOptionsTestSupport extends TestSupport {
diff --git a/src/test/resources/test-dependencies.txt b/src/test/resources/test-dependencies.txt
index b418373..fa43db7 100644
--- a/src/test/resources/test-dependencies.txt
+++ b/src/test/resources/test-dependencies.txt
@@ -1,3 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
[feature name=test]
# Dependencies
[artifacts]
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 19/39: SLING-6425 Update
Pax Exam to 4.10
Posted by ro...@apache.org.
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 aa6de2424b412676bbd9f04b33892a616963f1ae
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jan 31 21:36:31 2017 +0000
SLING-6425 Update Pax Exam to 4.10
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1781173 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2ab6026..9bb462e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<sling.java.version>7</sling.java.version>
- <org.ops4j.pax.exam.version>4.9.1</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.10.0</org.ops4j.pax.exam.version>
</properties>
<scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 32/39: add note about
cleaning up sling home when using options without configured working
directory (SLING-6653)
Posted by ro...@apache.org.
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 505531ac3ee063439a6e64cf9c7c928c8162319a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Thu Mar 16 15:35:11 2017 +0000
add note about cleaning up sling home when using options without configured working directory (SLING-6653)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1787208 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 1d1a739..e177a32 100644
--- a/README.md
+++ b/README.md
@@ -128,4 +128,6 @@ Create a test class (extend `TestSupport` to use helper methods and `Option`s) a
using a version from project (`pom.xml`):
- SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server");
\ No newline at end of file
+ SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server");
+
+**NOTE:** When using `slingLaunchpadOakTar()` or `slingLaunchpadOakMongo()` without _working directory_, _HTTP port_ and _Mongo URI_ make sure to clean up file system and database after each test and do not run tests in parallel to prevent interferences between tests.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 15/39: SLING-6464 Update
options and versions to latest features
Posted by ro...@apache.org.
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 2da76f4d395584dad0e7e744d2d623256907dc3e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 23 14:35:28 2017 +0000
SLING-6464 Update options and versions to latest features
revert r1779933
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1779935 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/testing/paxexam/SlingOptions.java | 5 +-
.../testing/paxexam/SlingVersionResolver.java | 176 +--------------------
2 files changed, 7 insertions(+), 174 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 4eac03c..3389f6b 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -134,7 +134,7 @@ public class SlingOptions {
mavenBundle().groupId("org.apache.commons").artifactId("commons-math").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:hierarchy=sling-readall", "org.apache.sling.resourceresolver:observation=sling-readall", "org.apache.sling.resourceresolver:console=sling-readall"})
+ .put("user.mapping", new String[]{"org.apache.sling.resourceresolver:mapping=sling-mapping", "org.apache.sling.resourceresolver:read=sling-readall"})
.asOption()
);
}
@@ -324,6 +324,7 @@ public class SlingOptions {
slingJcr(),
slingScripting(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.core").version(versionResolver),
+ mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.jmx").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.support").version(versionResolver),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.hc.webconsole").version(versionResolver)
);
@@ -552,7 +553,7 @@ public class SlingOptions {
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 [...]
+ .put("references", new String[]{"raw:classpath://org.apache.sling.karaf-repoinit/repoinit.txt"})
.asOption(),
factoryConfiguration("org.apache.felix.jaas.Configuration.factory")
.put("jaas.classname", "org.apache.jackrabbit.oak.spi.security.authentication.GuestLoginModule")
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 bb312a5..4a558a3 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -60,7 +60,6 @@ public class SlingVersionResolver implements VersionResolver {
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("com.sun.mail:javax.mail", "1.5.6");
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");
@@ -69,9 +68,7 @@ public class SlingVersionResolver implements VersionResolver {
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.6");
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.5");
versions.put("org.apache.commons:commons-math", "2.2");
versions.put("org.apache.felix:org.apache.felix.inventory", "1.0.4");
@@ -88,7 +85,6 @@ 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.httpcomponents:httpcore-osgi", "4.4.6");
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");
@@ -117,8 +113,6 @@ public class SlingVersionResolver implements VersionResolver {
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.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.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");
@@ -139,8 +133,9 @@ public class SlingVersionResolver implements VersionResolver {
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.fsresource", "1.2.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.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.5.6");
@@ -177,15 +172,14 @@ public class SlingVersionResolver implements VersionResolver {
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.5.12");
+ 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.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.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.2.4");
+ 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.28");
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.compiler", "1.0.4");
@@ -200,10 +194,7 @@ public class SlingVersionResolver implements VersionResolver {
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.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.16");
- versions.put("org.apache.sling.samples:org.apache.sling.samples.fling", "0.0.1-SNAPSHOT");
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");
@@ -211,165 +202,6 @@ public class SlingVersionResolver implements VersionResolver {
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", "3.4.1");
- 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.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");
- versions.put("commons-io:commons-io", "2.5");
- versions.put("commons-lang:commons-lang", "2.6");
- 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.servlet:javax.servlet-api", "3.1.0");
- 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.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");
- versions.put("org.apache.geronimo.bundles:json", "20090211_1");
- versions.put("org.apache.geronimo.specs:geronimo-atinject_1.0_spec", "1.0");
- versions.put("org.apache.geronimo.specs:geronimo-el_2.2_spec", "1.0.4");
- 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.2");
- versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.5");
- versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.6");
- 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.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.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.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.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.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.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.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.2.0");
- versions.put("org.apache.sling:org.apache.sling.fsresource", "1.2.2");
- versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.2");
- 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.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.22");
- versions.put("org.apache.sling:org.apache.sling.jcr.api", "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.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.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.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.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.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.5.12");
- 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.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.2.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.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.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.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", "3.4.1");
- 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.5.2");
- versions.put("org.ops4j.pax.url:pax-url-commons", "2.5.2");
}
private String key(final String groupId, final String artifactId) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-testing-paxexam] 12/39: SLING-6473 - Create
a VersionResolver that provides versions from provisioning model files
Posted by ro...@apache.org.
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 f6bd96fa69465391d9382de4fdc891d37c3930df
Author: Julian Sedding <js...@apache.org>
AuthorDate: Tue Jan 17 12:29:56 2017 +0000
SLING-6473 - Create a VersionResolver that provides versions from provisioning model files
- implementation of a ProvisioningModelVersionResolver that can
be created by pointing to provisioning model via a URL
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/org.apache.sling.testing.paxexam@1779180 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 12 ++
.../paxexam/ProvisioningModelVersionResolver.java | 136 +++++++++++++++++++++
.../ProvisioningModelVersionResolverTest.java | 55 +++++++++
src/test/resources/test-dependencies.txt | 7 ++
4 files changed, 210 insertions(+)
diff --git a/pom.xml b/pom.xml
index b5b709a..36b8580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,6 +105,12 @@
<artifactId>osgi.cmpn</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.provisioning.model</artifactId>
+ <version>1.8.0</version>
+ <scope>provided</scope>
+ </dependency>
<!-- Apache Felix -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -146,6 +152,12 @@
<version>${org.ops4j.pax.exam.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.13</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java b/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
new file mode 100644
index 0000000..6cc1207
--- /dev/null
+++ b/src/main/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolver.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.paxexam;
+
+import org.apache.sling.provisioning.model.Artifact;
+import org.apache.sling.provisioning.model.ArtifactGroup;
+import org.apache.sling.provisioning.model.Feature;
+import org.apache.sling.provisioning.model.Model;
+import org.apache.sling.provisioning.model.RunMode;
+import org.apache.sling.provisioning.model.io.ModelReader;
+import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * VersionResolver that reads version information from a sling provisioning file.
+ * One use-case is to reference Sling's launchpad, which normally references a
+ * (recent) set of compatible bundles, in order to allow running test based on
+ * the versioning information from the Sling launchpad's provisioning model.
+ */
+public class ProvisioningModelVersionResolver implements VersionResolver {
+
+ private final Model model;
+
+ /**
+ * Adds classifier "slingfeature" and type "txt" to the provided MavenArtifactUrlReference
+ * to simplify creation of a VersionResolver based on a slingfeature.
+ *
+ * @param reference Maven coordinates of a module that provides a slingfeature.
+ * @return VersionResolver instance backed by the referenced slingfeature.
+ */
+ public static VersionResolver fromSlingfeature(MavenArtifactUrlReference reference) {
+ final String url = reference.classifier("slingfeature").type("txt").getURL();
+ try {
+ return new ProvisioningModelVersionResolver(url);
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Constructor to create a VersionResolver instance backed by a provisioning model referenced
+ * by the URL represented by the provided String.
+ *
+ * @param url The String representation of a URL.
+ * @throws MalformedURLException If the String representation of the URL is not a valid URL.
+ */
+ public ProvisioningModelVersionResolver(final String url) throws MalformedURLException {
+ this(toUrl(url));
+ }
+
+ /**
+ * Constructor to create a VersionResolver instance backed by a provisioning model referenced
+ * by the provided URL object.
+ *
+ * @param url The URL pointing the the provisioning model file.
+ */
+ public ProvisioningModelVersionResolver(final URL url) {
+ InputStream inputStream = null;
+ try {
+ inputStream = url.openStream();
+ this.model = ModelReader.read(new InputStreamReader(inputStream), url.toExternalForm());
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to read " + url.toExternalForm(), e);
+ } finally {
+ if (inputStream != null) {
+ try {
+ inputStream.close();
+ } catch (IOException e) {
+ // silent
+ }
+ }
+ }
+ }
+
+ private static URL toUrl(final String url) throws MalformedURLException {
+ final boolean hasProtocolHandler = System.getProperty("java.protocol.handler.pkgs") != null;
+ if (!hasProtocolHandler) {
+ // enable org.ops4j.pax.url handlers by default, unless the property is already set
+ System.setProperty("java.protocol.handler.pkgs", "org.ops4j.pax.url");
+ }
+ try {
+ return new URL(url);
+ } catch (final MalformedURLException e) {
+ if ("unknown protocol: mvn".equals(e.getMessage())) {
+ // best effort: present a helpful message in case the mvn protocol handler is missing
+ final MalformedURLException exception = new MalformedURLException(e.getMessage()
+ + " -> Consider a dependency to org.ops4j.pax.url:pax-url-aether");
+ exception.initCause(e);
+ throw exception;
+ }
+ throw e;
+ } finally {
+ if (!hasProtocolHandler) {
+ System.clearProperty("java.protocol.handler.pkgs");
+ }
+ }
+ }
+
+ @Override
+ public String getVersion(final String groupId, final String artifactId) {
+ for (final Feature feature : model.getFeatures()) {
+ for (final RunMode runMode : feature.getRunModes()) {
+ for (final ArtifactGroup artifacts : runMode.getArtifactGroups()) {
+ for (final Artifact artifact : artifacts) {
+ if (groupId.equals(artifact.getGroupId()) && artifactId.equals(artifact.getArtifactId())) {
+ return artifact.getVersion();
+ }
+ }
+ }
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java b/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java
new file mode 100644
index 0000000..6529c11
--- /dev/null
+++ b/src/test/java/org/apache/sling/testing/paxexam/ProvisioningModelVersionResolverTest.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.testing.paxexam;
+
+import org.junit.Test;
+import org.ops4j.pax.exam.options.MavenUrlReference.VersionResolver;
+
+import static org.apache.sling.testing.paxexam.ProvisioningModelVersionResolver.fromSlingfeature;
+import static org.junit.Assert.assertEquals;
+import static org.ops4j.pax.exam.CoreOptions.maven;
+
+public class ProvisioningModelVersionResolverTest {
+
+ @Test
+ public void getVersionFromClasspathResource() throws Exception {
+ final VersionResolver versionResolver =
+ new ProvisioningModelVersionResolver(getClass().getResource("/test-dependencies.txt"));
+ assertVersion("2.6.4", "org.apache.sling", "org.apache.sling.engine", versionResolver);
+ assertVersion("2.4.10", "org.apache.sling", "org.apache.sling.servlets.resolver", versionResolver);
+ assertVersion("2.1.18", "org.apache.sling", "org.apache.sling.servlets.get", versionResolver);
+ assertVersion("2.3.14", "org.apache.sling", "org.apache.sling.servlets.post", versionResolver);
+ }
+
+ @Test
+ public void getVersionFromMavenDependency() throws Exception {
+ final VersionResolver versionResolver =
+ fromSlingfeature(maven("org.apache.sling", "org.apache.sling.launchpad", "8"));
+ assertVersion("2.4.4", "org.apache.sling", "org.apache.sling.engine", versionResolver);
+ assertVersion("2.3.8", "org.apache.sling", "org.apache.sling.servlets.resolver", versionResolver);
+ assertVersion("2.1.12", "org.apache.sling", "org.apache.sling.servlets.get", versionResolver);
+ assertVersion("2.3.8", "org.apache.sling", "org.apache.sling.servlets.post", versionResolver);
+ }
+
+ private void assertVersion(final String expectedVersion,
+ final String groupId, final String artifactId, final VersionResolver versionResolver) {
+ final String actualVersion = versionResolver.getVersion(groupId, artifactId);
+ assertEquals("Version mismatch for " + groupId + ":" + artifactId, expectedVersion, actualVersion);
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/test-dependencies.txt b/src/test/resources/test-dependencies.txt
new file mode 100644
index 0000000..b418373
--- /dev/null
+++ b/src/test/resources/test-dependencies.txt
@@ -0,0 +1,7 @@
+[feature name=test]
+# Dependencies
+[artifacts]
+ org.apache.sling/org.apache.sling.engine/2.6.4
+ org.apache.sling/org.apache.sling.servlets.resolver/2.4.10
+ org.apache.sling/org.apache.sling.servlets.get/2.1.18
+ org.apache.sling/org.apache.sling.servlets.post/2.3.14
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.