Author: jukka
Date: Tue Mar 25 03:27:06 2014
New Revision: 1581207
URL: http://svn.apache.org/r1581207
Log:
OAK-1594: Build fails on Java 8
Upgrade the OSGi test setup to version that works with Java 8
Modified:
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1581207&r1=1581206&r2=1581207&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Tue Mar 25 03:27:06 2014
@@ -117,6 +117,12 @@
<artifactId>pax-exam-junit4</artifactId>
<version>${pax.exam.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -133,7 +139,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>3.2.2</version>
+ <version>4.2.1</version>
<scope>test</scope>
</dependency>
<dependency>
