incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1477924 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Date Wed, 01 May 2013 07:53:39 GMT
Author: rombert
Date: Wed May  1 07:53:39 2013
New Revision: 1477924

URL: http://svn.apache.org/r1477924
Log:
SLING-2848 : Event integration tests fail due to unresolvable artifacts

Added support for the maven.repo.local system property in
AbstractJobHandlingTest. The tests fail for me locally since they
reference a snapshot artifact - org.apache.sling.jcr.jackrabbit.server -
but let's see if this fixes the build on Jenkins.

Modified:
    sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java

Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1477924&r1=1477923&r2=1477924&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
(original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Wed May  1 07:53:39 2013
@@ -22,6 +22,8 @@ package org.apache.sling.event.it;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.when;
 
 import java.io.File;
 import java.io.IOException;
@@ -68,7 +70,12 @@ public abstract class AbstractJobHandlin
                 + BUNDLE_JAR_SYS_PROP + " system property" );
         }
 
+        String localRepo = System.getProperty("maven.repo.local", "");
+
         return options(
+                when( localRepo.length() > 0 ).useOptions(
+                        systemProperty("org.ops4j.pax.url.mvn.localRepository").value(localRepo)
+                ),
                 mavenBundle("org.apache.sling", "org.apache.sling.fragment.xml", "1.0.2"),
                 mavenBundle("org.apache.sling", "org.apache.sling.fragment.transaction",
"1.0.0"),
                 mavenBundle("org.apache.sling", "org.apache.sling.fragment.activation", "1.0.2"),



Mime
View raw message