svn commit: r1678206 - in /jackrabbit/oak/branches/1.2: ./ oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java

[chetanm]

Author: chetanm
Date: Thu May  7 13:43:56 2015
New Revision: 1678206

URL: http://svn.apache.org/r1678206
Log:
OAK-2838 - Test failure: OSGiIT

Merging 1678173

Modified:
    jackrabbit/oak/branches/1.2/   (props changed)
    
jackrabbit/oak/branches/1.2/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java

Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May  7 13:43:56 2015
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939,1678173
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.2/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1678206&r1=1678205&r2=1678206&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.2/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
 (original)
+++ 
jackrabbit/oak/branches/1.2/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
 Thu May  7 13:43:56 2015
@@ -20,6 +20,7 @@ import static java.lang.System.getenv;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeTrue;
 import static org.ops4j.pax.exam.CoreOptions.bundle;
+import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.systemProperties;
@@ -61,6 +62,7 @@ public class OSGiIT {
                 mavenBundle( "org.apache.felix", 
"org.apache.felix.configadmin", "1.4.0" ),
                 mavenBundle( "org.apache.felix", 
"org.apache.felix.fileinstall", "3.2.6" ),
                 mavenBundle( "org.ops4j.pax.logging", "pax-logging-api", 
"1.7.2" ),
+                frameworkProperty("repository.home").value("target"),
                 systemProperties(new 
SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),
                 jarBundles());
     }