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/05/04 15:15:53 UTC
svn commit: r1333940 - in /jackrabbit/oak/trunk: oak-mk/pom.xml
oak-parent/pom.xml
Author: jukka
Date: Fri May 4 13:15:52 2012
New Revision: 1333940
URL: http://svn.apache.org/viewvc?rev=1333940&view=rev
Log:
OAK-67 OSGi Bundle Setup
Update OSGi dependencies
Modified:
jackrabbit/oak/trunk/oak-mk/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1333940&r1=1333939&r2=1333940&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Fri May 4 13:15:52 2012
@@ -53,7 +53,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.7.2</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@@ -99,9 +98,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1333940&r1=1333939&r2=1333940&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Fri May 4 13:15:52 2012
@@ -78,6 +78,11 @@
<extensions>true</extensions>
</plugin>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <version>1.7.4</version>
+ </plugin>
+ <plugin>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>${skip.deployment}</skip>
@@ -97,12 +102,12 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.0.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.0.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>biz.aQute</groupId>
@@ -110,6 +115,11 @@
<version>1.50.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.10</version>