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 2013/12/06 13:16:55 UTC
svn commit: r1548499 - in /jackrabbit/oak/trunk: oak-core/pom.xml
oak-lucene/pom.xml oak-mk-api/pom.xml oak-mk-remote/pom.xml oak-mk/pom.xml
oak-parent/pom.xml
Author: jukka
Date: Fri Dec 6 12:16:54 2013
New Revision: 1548499
URL: http://svn.apache.org/r1548499
Log:
OAK-17: Modularisation and configuration concept
Upgrade to latest bnd/scr versions to give us more OSGi configuration features
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-mk-api/pom.xml
jackrabbit/oak/trunk/oak-mk-remote/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=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Dec 6 12:16:54 2013
@@ -165,7 +165,7 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Fri Dec 6 12:16:54 2013
@@ -143,7 +143,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-mk-api/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-api/pom.xml?rev=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-api/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-api/pom.xml Fri Dec 6 12:16:54 2013
@@ -64,7 +64,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-mk-remote/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-remote/pom.xml?rev=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-remote/pom.xml Fri Dec 6 12:16:54 2013
@@ -65,7 +65,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Fri Dec 6 12:16:54 2013
@@ -50,14 +50,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <!-- See https://issues.apache.org/jira/browse/FELIX-2492 -->
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>${slf4j.api.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
@@ -75,7 +67,7 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</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=1548499&r1=1548498&r2=1548499&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Fri Dec 6 12:16:54 2013
@@ -94,7 +94,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.4.0</version>
<extensions>true</extensions>
<inherited>true</inherited>
<configuration>
@@ -111,7 +111,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
- <version>1.9.0</version>
+ <version>1.15.0</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@@ -275,14 +275,14 @@
<version>4.2.0</version>
</dependency>
<dependency>
- <groupId>biz.aQute</groupId>
+ <groupId>biz.aQute.bnd</groupId>
<artifactId>bndlib</artifactId>
- <version>1.50.0</version>
+ <version>2.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.7.0</version>
+ <version>1.9.6</version>
</dependency>
<dependency>
<groupId>junit</groupId>