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-karaf-launchpad-oak-tar-integration-tests.git


The following commit(s) were added to refs/heads/master by this push:
     new 1a26bad  override JUnit (provided by org.apache.sling.junit.core)
1a26bad is described below

commit 1a26bad1de52db179160d2cf8238aed1eed94411
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Fri Feb 9 13:41:29 2018 +0100

    override JUnit (provided by org.apache.sling.junit.core)
---
 .../karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
 
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
index 26d1491..0daaa22 100644
--- 
a/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
+++ 
b/src/test/java/org/apache/sling/karaf/tests/configuration/SlingQuickstartOakTarConfiguration.java
@@ -26,6 +26,7 @@ import org.ops4j.pax.exam.OptionUtils;
 import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.editConfigurationFilePut;
+import static 
org.ops4j.pax.exam.karaf.options.KarafDistributionOption.overrideJUnitBundles;
 
 public class SlingQuickstartOakTarConfiguration extends KarafTestSupport {
 
@@ -69,7 +70,8 @@ public class SlingQuickstartOakTarConfiguration extends 
KarafTestSupport {
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.test-fragment").versionAsInProject(),
             
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.testing.tools").versionAsInProject(),
             
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(),
-            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject()
+            
mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(),
+            overrideJUnitBundles()
         );
     }
 

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.

Reply via email to