This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git
commit fc3dceb8949f9d039d39fcd24823ef11611b6c7d Author: Oliver Lietz <[email protected]> AuthorDate: Sun Jul 21 20:29:16 2019 +0200 SLING-8547 Provide Testcontainers Option Adjust Testcontainers bundle (fixes classloading issue with Junit/Hamcrest) --- src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java | 5 ++++- src/main/resources/templates/SlingOptions.hbs | 5 ++++- 2 files changed, 8 insertions(+), 2 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 94ff421..ae96a79 100644 --- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java +++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java @@ -19,9 +19,11 @@ package org.apache.sling.testing.paxexam; import org.ops4j.pax.exam.options.ModifiableCompositeOption; +import org.ops4j.pax.exam.options.WrappedUrlProvisionOption; import org.ops4j.pax.exam.util.PathUtils; import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @@ -176,9 +178,10 @@ public class SlingOptions { public static ModifiableCompositeOption testcontainers() { return composite( + junitBundles(), paxUrlWrap(), wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").version(versionResolver)), - wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").version(versionResolver)) + wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").version(versionResolver)).imports("org.junit.rules").overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.MERGE) ); } diff --git a/src/main/resources/templates/SlingOptions.hbs b/src/main/resources/templates/SlingOptions.hbs index 7537697..358ac68 100644 --- a/src/main/resources/templates/SlingOptions.hbs +++ b/src/main/resources/templates/SlingOptions.hbs @@ -19,9 +19,11 @@ package org.apache.sling.testing.paxexam; import org.ops4j.pax.exam.options.ModifiableCompositeOption; +import org.ops4j.pax.exam.options.WrappedUrlProvisionOption; import org.ops4j.pax.exam.util.PathUtils; import static org.ops4j.pax.exam.CoreOptions.composite; +import static org.ops4j.pax.exam.CoreOptions.junitBundles; import static org.ops4j.pax.exam.CoreOptions.mavenBundle; import static org.ops4j.pax.exam.CoreOptions.systemPackages; import static org.ops4j.pax.exam.CoreOptions.systemProperty; @@ -174,9 +176,10 @@ public class SlingOptions { public static ModifiableCompositeOption testcontainers() { return composite( + junitBundles(), paxUrlWrap(), wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").version(versionResolver)), - wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").version(versionResolver)) + wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").version(versionResolver)).imports("org.junit.rules").overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.MERGE) ); } {{#each features}}
