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/25 13:49:13 UTC
svn commit: r1330218 - in /jackrabbit/oak/trunk: oak-core/pom.xml
oak-it/osgi/ oak-it/osgi/pom.xml oak-it/pom.xml oak-mk/pom.xml
oak-parent/pom.xml
Author: jukka
Date: Wed Apr 25 11:49:13 2012
New Revision: 1330218
URL: http://svn.apache.org/viewvc?rev=1330218&view=rev
Log:
OAK-67: Initial OSGi Bundle Setup
Only include the bndlib dependency where it's actually needed.
Add a placeholder for OSGi integration tests
Added:
jackrabbit/oak/trunk/oak-it/osgi/
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
- copied, changed from r1330214, jackrabbit/oak/trunk/oak-it/pom.xml
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-it/pom.xml
jackrabbit/oak/trunk/oak-mk/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1330218&r1=1330217&r2=1330218&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Apr 25 11:49:13 2012
@@ -49,6 +49,12 @@
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk</artifactId>
<version>${project.version}</version>
Copied: jackrabbit/oak/trunk/oak-it/osgi/pom.xml (from r1330214, jackrabbit/oak/trunk/oak-it/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?p2=jackrabbit/oak/trunk/oak-it/osgi/pom.xml&p1=jackrabbit/oak/trunk/oak-it/pom.xml&r1=1330214&r2=1330218&rev=1330218&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Wed Apr 25 11:49:13 2012
@@ -24,20 +24,14 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-parent</artifactId>
<version>0.2-SNAPSHOT</version>
- <relativePath>../oak-parent/pom.xml</relativePath>
+ <relativePath>../../oak-parent/pom.xml</relativePath>
</parent>
- <artifactId>oak-it</artifactId>
- <name>Oak Integration Tests</name>
- <packaging>pom</packaging>
+ <artifactId>oak-it-osgi</artifactId>
+ <name>Oak Integration Tests for OSGi deployments</name>
<properties>
<skip.deployment>true</skip.deployment>
</properties>
- <modules>
- <module>jcr</module>
- <module>mk</module>
- </modules>
-
</project>
Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1330218&r1=1330217&r2=1330218&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Wed Apr 25 11:49:13 2012
@@ -38,6 +38,7 @@
<modules>
<module>jcr</module>
<module>mk</module>
+ <module>osgi</module>
</modules>
</project>
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1330218&r1=1330217&r2=1330218&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Wed Apr 25 11:49:13 2012
@@ -30,7 +30,7 @@
<artifactId>oak-mk</artifactId>
<name>Oak Microkernel</name>
<packaging>bundle</packaging>
-
+
<build>
<plugins>
<plugin>
@@ -50,6 +50,12 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Optional dependencies for different persistence backends -->
<dependency>
<groupId>com.h2database</groupId>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1330218&r1=1330217&r2=1330218&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Apr 25 11:49:13 2012
@@ -90,21 +90,17 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <version>1.50.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>
</dependency>
</dependencies>
</dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bndlib</artifactId>
- <version>1.50.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
<profiles>
<profile>