You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/02/12 12:29:33 UTC
[sling-org-apache-sling-testing-paxexam] branch feature/oak-1.8
updated (d70d3c2 -> 1d5b806)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git.
from d70d3c2 SLING-7438 Update options and versions to Oak 1.8
new b3c3c1a SLING-7080 Update options and versions to latest features
new 4d6a559 trim README and link to Testing PaxExam's documentation page
new 59fc137 [maven-release-plugin] prepare for next development iteration
new d60239b [maven-release-plugin] prepare release org.apache.sling.testing.paxexam-1.0.0
new 1d5b806 [maven-release-plugin] prepare for next development iteration
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 159 ++-------------------
pom.xml | 3 +-
.../apache/sling/testing/paxexam/SlingOptions.java | 1 +
.../testing/paxexam/SlingVersionResolver.java | 30 ++--
4 files changed, 26 insertions(+), 167 deletions(-)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 03/05:
[maven-release-plugin] prepare for next development iteration
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 59fc137c0e89f9327208e0a0f9e5c892686cbd7e
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 29 16:53:00 2018 +0100
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 25f5fd7..146e1ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling Testing PaxExam</name>
<description>Test support for use with Pax Exam.</description>
@@ -45,6 +45,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-paxexam.git</url>
+ <tag>HEAD</tag>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 01/05: SLING-7080 Update
options and versions to latest features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit b3c3c1ab55936bb5e37f028eda4fa6b31c48d59b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 29 15:36:23 2018 +0100
SLING-7080 Update options and versions to latest features
use latest releases and releases under vote
---
.../apache/sling/testing/paxexam/SlingOptions.java | 1 +
.../testing/paxexam/SlingVersionResolver.java | 30 +++++++++++-----------
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 320bc98..c349835 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -403,6 +403,7 @@ public class SlingOptions {
sling(),
jackrabbit(),
slingEvent(),
+ slingModels(),
slingQuery(),
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").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 3490eb0..863acbe 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingVersionResolver.java
@@ -66,9 +66,9 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("com.composum.sling.core:composum-sling-core-jslibs", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-package-manager", "1.8.2");
versions.put("com.composum.sling.core:composum-sling-user-management", "1.8.2");
- versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.3");
- versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.3");
- versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.3");
+ versions.put("com.fasterxml.jackson.core:jackson-annotations", "2.9.4");
+ versions.put("com.fasterxml.jackson.core:jackson-core", "2.9.4");
+ versions.put("com.fasterxml.jackson.core:jackson-databind", "2.9.4");
versions.put("com.google.guava:guava", "15.0");
versions.put("com.h2database:h2-mvstore", "1.4.196");
versions.put("com.sun.mail:javax.mail", "1.6.0");
@@ -97,8 +97,8 @@ 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.4");
- versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.8");
+ versions.put("org.apache.httpcomponents:httpclient-osgi", "4.5.5");
+ versions.put("org.apache.httpcomponents:httpcore-osgi", "4.4.9");
versions.put("org.apache.jackrabbit:jackrabbit-api", "2.16.0");
versions.put("org.apache.jackrabbit:jackrabbit-data", "2.16.0");
versions.put("org.apache.jackrabbit:jackrabbit-jcr-commons", "2.16.0");
@@ -132,7 +132,7 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.auth.selector", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.bundleresource.impl", "2.3.0");
versions.put("org.apache.sling:org.apache.sling.commons.classloader", "1.4.2");
- versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.4");
+ versions.put("org.apache.sling:org.apache.sling.commons.compiler", "2.3.6");
versions.put("org.apache.sling:org.apache.sling.commons.fsclassloader", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.commons.html", "1.0.0");
versions.put("org.apache.sling:org.apache.sling.commons.johnzon", "1.1.0");
@@ -140,7 +140,7 @@ public class SlingVersionResolver implements VersionResolver {
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.7.2");
- versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.10");
+ versions.put("org.apache.sling:org.apache.sling.commons.threads", "3.2.16");
versions.put("org.apache.sling:org.apache.sling.discovery.api", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.discovery.base", "2.0.4");
versions.put("org.apache.sling:org.apache.sling.discovery.commons", "1.0.20");
@@ -155,12 +155,12 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.event.dea", "1.1.2");
versions.put("org.apache.sling:org.apache.sling.extensions.threaddump", "0.2.2");
versions.put("org.apache.sling:org.apache.sling.featureflags", "1.2.2");
- versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.6");
+ versions.put("org.apache.sling:org.apache.sling.fsresource", "2.1.10");
versions.put("org.apache.sling:org.apache.sling.hc.api", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.hc.core", "1.2.10");
versions.put("org.apache.sling:org.apache.sling.hc.support", "1.0.4");
versions.put("org.apache.sling:org.apache.sling.hc.webconsole", "1.1.2");
- versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.10");
+ versions.put("org.apache.sling:org.apache.sling.i18n", "2.5.12");
versions.put("org.apache.sling:org.apache.sling.installer.console", "1.0.2");
versions.put("org.apache.sling:org.apache.sling.installer.core", "3.8.10");
versions.put("org.apache.sling:org.apache.sling.installer.factory.configuration", "1.1.2");
@@ -190,14 +190,14 @@ 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", "1.1.0");
+ versions.put("org.apache.sling:org.apache.sling.pipes", "2.0.0");
versions.put("org.apache.sling:org.apache.sling.provisioning.model", "1.8.4");
- versions.put("org.apache.sling:org.apache.sling.query", "3.0.0");
+ versions.put("org.apache.sling:org.apache.sling.query", "4.0.0");
versions.put("org.apache.sling:org.apache.sling.repoinit.parser", "1.2.0");
versions.put("org.apache.sling:org.apache.sling.resource.inventory", "1.0.8");
versions.put("org.apache.sling:org.apache.sling.resource.presence", "0.0.2");
- versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.4");
- versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.32");
+ versions.put("org.apache.sling:org.apache.sling.resourcemerger", "1.3.8");
+ versions.put("org.apache.sling:org.apache.sling.resourceresolver", "1.5.34");
versions.put("org.apache.sling:org.apache.sling.rewriter", "1.2.2");
versions.put("org.apache.sling:org.apache.sling.scripting.api", "2.2.0");
versions.put("org.apache.sling:org.apache.sling.scripting.core", "2.0.54");
@@ -213,9 +213,9 @@ public class SlingVersionResolver implements VersionResolver {
versions.put("org.apache.sling:org.apache.sling.scripting.sightly.models.provider", "1.0.6");
versions.put("org.apache.sling:org.apache.sling.scripting.thymeleaf", "1.1.0");
versions.put("org.apache.sling:org.apache.sling.security", "1.1.10");
- versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.3.6");
+ versions.put("org.apache.sling:org.apache.sling.serviceusermapper", "1.4.0");
versions.put("org.apache.sling:org.apache.sling.servlets.get", "2.1.30");
- versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.22");
+ versions.put("org.apache.sling:org.apache.sling.servlets.post", "2.3.24");
versions.put("org.apache.sling:org.apache.sling.servlets.resolver", "2.4.22");
versions.put("org.apache.sling:org.apache.sling.settings", "1.3.8");
versions.put("org.apache.sling:org.apache.sling.urlrewriter", "0.0.2");
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 02/05: trim README and
link to Testing PaxExam's documentation page
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 4d6a55928a9e7a64613c686dbad60add13a5d17b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 29 16:12:37 2018 +0100
trim README and link to Testing PaxExam's documentation page
---
README.md | 159 ++++----------------------------------------------------------
1 file changed, 8 insertions(+), 151 deletions(-)
diff --git a/README.md b/README.md
index 4633028..436c91d 100644
--- a/README.md
+++ b/README.md
@@ -2,160 +2,17 @@
This module is part of the [Apache Sling](https://sling.apache.org) project.
-**Test support for use with [Pax Exam](https://github.com/ops4j/org.ops4j.pax.exam2).**
-* [_Sling's Karaf Features_](https://sling.apache.org/documentation/karaf.html#sling-karaf-features) as `Option`s for Pax Exam (without Karaf)
-* `TestSupport` with common helper methods and `Option`s
+## Overview
-**Provided features:**
+This module provides test support for use with [Pax Exam](https://github.com/ops4j/org.ops4j.pax.exam2) to test with *real* Sling instances – no limitations or issues due to incomplete and faulty mock implementations.
-* run integration tests in a Sling instance in the same module (with the build artifact under test)
-* use different versions in build (e.g. *minimal*) and tests (e.g. *latest*)
-* overriding of versions
-
-## Getting Started
-
-### 1. Add required dependencies:
-
- <!-- Sling Testing PaxExam -->
- <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>
-
- <!-- an OSGi framework -->
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>5.6.10</version>
- <scope>test</scope>
- </dependency>
-
- <!-- JUnit and Pax Exam -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</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>
-
-### 2. Configure the build artifact (*bundle*) to use in integration testing in `pom.xml`:
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.18.1</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
- <systemProperties>
- <property>
- <name>bundle.filename</name>
- <value>${basedir}/target/${project.build.finalName}.jar</value>
- </property>
- </systemProperties>
- </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.4.0</version>
- <executions>
- <execution>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
-### 3. Create a test class (extend `TestSupport` to use helper methods and `Option`s) and provide a *Configuration* (`Option[]`) for Pax Exam:
-
- @Configuration
- public Option[] configuration() {
- return new Option[]{
- baseConfiguration(), // from TestSupport
- quickstart(),
- // build artifact
- testBundle("bundle.filename"), // from TestSupport
- // testing
- junitBundles()
- };
- }
-
- protected Option quickstart() {
- final String workingDirectory = workingDirectory(); // from TestSupport
- final int httpPort = findFreePort(); // from TestSupport
- return composite(
- slingQuickstartOakTar(workingDirectory, httpPort), // from SlingOptions
- slingExtensionModels(), // from SlingOptions (for illustration)
- slingScriptingThymeleaf() // from SlingOptions (for illustration)
- );
- }
+See Testing PaxExam's [documentation page](https://sling.apache.org/documentation/development/testing-paxexam.html) for details and how to use.
-The above configuration provides all bundles and OSGi configurations to run a Sling Quickstart setup with Extension Models and Scripting Thymeleaf.
-
-**NOTE:** When using `slingQuickstartOakTar()` or `slingQuickstartOakMongo()` 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.
-
-## Overriding or adding versions
-
-To use different versions of bundles in tests than the ones in `SlingVersionResolver` create a custom `SlingVersionResolver` (extending `SlingVersionResolver`) and set it in `SlingOptions`:
-
- SlingOptions.versionResolver = new CustomSlingVersionResolver();
-
-or simply (re)set versions in `SlingVersionResolver`:
-
- SlingOptions.versionResolver.setVersion(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server", "1.1.0");
-
-To use a version from project (`pom.xml`) use `setVersionFromProject(String, String)` with `groupId` and `artifactId`:
-
- SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, "org.apache.sling.jcr.oak.server");
-
-## Logging
-
-See Pax Exam's [Logging Configuration](https://ops4j1.jira.com/wiki/spaces/PAXEXAM4/pages/54263891/Logging+Configuration) if logging needs to be tweaked.
-
-For [Logback](https://logback.qos.ch) use `SlingOptions#logback()` and add both `exam.properties` and `logback.xml` to `src/test/resources` as described in Pax Exam's [Logging Configuration](https://ops4j1.jira.com/wiki/spaces/PAXEXAM4/pages/54263891/Logging+Configuration).
+## Features
+* run integration tests in a *tailored* Sling instance in the *same module* (with the build artifact under test)
+* use different versions in build (e.g. *minimal*) and tests (e.g. *latest*)
+* overriding of versions
+* build bundles with test content and OSGi DS services on-the-fly (no need for extra modules)
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 04/05:
[maven-release-plugin] prepare release
org.apache.sling.testing.paxexam-1.0.0
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit d60239b32985f518b29c093dd7cfbed527d02d1c
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 29 18:17:27 2018 +0100
[maven-release-plugin] prepare release org.apache.sling.testing.paxexam-1.0.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 146e1ab..f671ff2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling Testing PaxExam</name>
<description>Test support for use with Pax Exam.</description>
@@ -45,7 +45,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-paxexam.git</url>
- <tag>HEAD</tag>
+ <tag>org.apache.sling.testing.paxexam-1.0.0</tag>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.
[sling-org-apache-sling-testing-paxexam] 05/05:
[maven-release-plugin] prepare for next development iteration
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch feature/oak-1.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit 1d5b806bd6774beba683b941bf2be71d97ee3f28
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 29 18:17:45 2018 +0100
[maven-release-plugin] prepare for next development iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index f671ff2..146e1ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling Testing PaxExam</name>
<description>Test support for use with Pax Exam.</description>
@@ -45,7 +45,7 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-testing-paxexam.git</url>
- <tag>org.apache.sling.testing.paxexam-1.0.0</tag>
+ <tag>HEAD</tag>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
olli@apache.org.