You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by al...@apache.org on 2014/01/16 11:54:40 UTC
svn commit: r1558750 -
/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Author: alexparvulescu
Date: Thu Jan 16 10:54:40 2014
New Revision: 1558750
URL: http://svn.apache.org/r1558750
Log:
OAK-1315 OSGiIT NPE parsing OsgiSecurityProvider.xml
Modified:
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
Modified: jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java?rev=1558750&r1=1558749&r2=1558750&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java Thu Jan 16 10:54:40 2014
@@ -54,7 +54,7 @@ public class OSGiIT {
public Option[] configuration() throws IOException, URISyntaxException {
return CoreOptions.options(
junitBundles(),
- mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.6.0"),
+ mavenBundle("org.apache.felix", "org.apache.felix.scr", "1.8.0"),
mavenBundle( "org.apache.felix", "org.apache.felix.configadmin", "1.4.0" ),
mavenBundle( "org.apache.felix", "org.apache.felix.fileinstall", "3.2.6" ),
systemProperties(new SystemPropertyOption("felix.fileinstall.dir").value(getConfigDir())),