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 ju...@apache.org on 2012/04/28 23:45:16 UTC
svn commit: r1331840 - in /jackrabbit/oak/trunk: oak-commons/pom.xml
oak-it/osgi/pom.xml
oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
oak-it/osgi/test-bundles.xml
Author: jukka
Date: Sat Apr 28 21:45:15 2012
New Revision: 1331840
URL: http://svn.apache.org/viewvc?rev=1331840&view=rev
Log:
OAK-77: Consolidate Utilities
Make oak-commons dependency work for OSGi deployments
Modified:
jackrabbit/oak/trunk/oak-commons/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/src/test/java/org/apache/jackrabbit/oak/osgi/OSGiIT.java
jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1331840&r1=1331839&r2=1331840&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-commons/pom.xml Sat Apr 28 21:45:15 2012
@@ -36,35 +36,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Export-Package>
- !
- </Export-Package>
- <Bundle-Activator>
- org.apache.jackrabbit.oak.jcr.osgi.Activator
- </Bundle-Activator>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- Optional OSGi dependencies, used only when running within OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1331840&r1=1331839&r2=1331840&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Sat Apr 28 21:45:15 2012
@@ -69,6 +69,12 @@
<dependencies>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk</artifactId>
<version>${project.version}</version>
<scope>test</scope>
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=1331840&r1=1331839&r2=1331840&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 Sat Apr 28 21:45:15 2012
@@ -36,7 +36,6 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
-@SuppressWarnings({ "rawtypes", "unchecked" })
public class OSGiIT {
private final File TARGET = new File("target");
@@ -51,6 +50,7 @@ public class OSGiIT {
bundle(new File(base, "commons-collections.jar").toURI().toURL().toString()),
bundle(new File(base, "jackrabbit-api.jar").toURI().toURL().toString()),
bundle(new File(base, "jackrabbit-jcr-commons.jar").toURI().toURL().toString()),
+ bundle(new File(base, "oak-commons.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-mk.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-core.jar").toURI().toURL().toString()),
bundle(new File(base, "oak-jcr.jar").toURI().toURL().toString()));
Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1331840&r1=1331839&r2=1331840&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Sat Apr 28 21:45:15 2012
@@ -33,6 +33,7 @@
<include>commons-collections:commons-collections</include>
<include>org.apache.jackrabbit:jackrabbit-api</include>
<include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
+ <include>org.apache.jackrabbit:oak-commons</include>
<include>org.apache.jackrabbit:oak-mk</include>
<include>org.apache.jackrabbit:oak-core</include>
<include>org.apache.jackrabbit:oak-jcr</include>