Author: rombert
Date: Wed Aug 2 14:30:24 2017
New Revision: 1803824
URL: http://svn.apache.org/viewvc?rev=1803824&view=rev
Log:
OAK-6449 - Stop using the maven-scr-plugin
Use the maven-bundle-plugin to generate the SCR descriptors
as well and enable incremental mode for Eclipse.
Modified:
jackrabbit/oak/trunk/oak-api/pom.xml
jackrabbit/oak/trunk/oak-auth-external/pom.xml
jackrabbit/oak/trunk/oak-auth-ldap/pom.xml
jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml
jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
jackrabbit/oak/trunk/oak-blob-plugins/pom.xml
jackrabbit/oak/trunk/oak-blob/pom.xml
jackrabbit/oak/trunk/oak-commons/pom.xml
jackrabbit/oak/trunk/oak-core-spi/pom.xml
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-exercise/pom.xml
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-lucene/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-remote/pom.xml
jackrabbit/oak/trunk/oak-segment-tar/pom.xml
jackrabbit/oak/trunk/oak-solr-core/pom.xml
jackrabbit/oak/trunk/oak-store-composite/pom.xml
jackrabbit/oak/trunk/oak-store-spi/pom.xml
Modified: jackrabbit/oak/trunk/oak-api/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-api/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-api/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-api/pom.xml Wed Aug 2 14:30:24 2017
@@ -53,10 +53,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -92,12 +88,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-auth-external/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-external/pom.xml Wed Aug 2 14:30:24 2017
@@ -44,10 +44,6 @@
<artifactId>maven-bundle-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -79,7 +75,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-auth-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/pom.xml Wed Aug 2 14:30:24 2017
@@ -59,10 +59,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -139,7 +135,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-authorization-cug/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/pom.xml Wed Aug 2 14:30:24 2017
@@ -38,10 +38,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -119,7 +115,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud-azure/pom.xml Wed Aug 2 14:30:24 2017
@@ -34,10 +34,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -72,7 +68,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-blob-cloud/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-cloud/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-cloud/pom.xml Wed Aug 2 14:30:24 2017
@@ -34,10 +34,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -66,7 +62,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-blob-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob-plugins/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob-plugins/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob-plugins/pom.xml Wed Aug 2 14:30:24 2017
@@ -32,10 +32,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -80,7 +76,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-blob/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-blob/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-blob/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-blob/pom.xml Wed Aug 2 14:30:24 2017
@@ -34,10 +34,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -69,7 +65,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-commons/pom.xml Wed Aug 2 14:30:24 2017
@@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-core-spi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core-spi/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core-spi/pom.xml Wed Aug 2 14:30:24 2017
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Aug 2 14:30:24 2017
@@ -103,10 +103,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -142,7 +138,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-exercise/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-exercise/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-exercise/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-exercise/pom.xml Wed Aug 2 14:30:24 2017
@@ -73,10 +73,6 @@
</instructions>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
</plugins>
</build>
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Aug 2 14:30:24 2017
@@ -150,10 +150,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -165,6 +161,15 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>derby.log</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<systemPropertyVariables>
@@ -191,7 +196,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Wed Aug 2 14:30:24 2017
@@ -132,10 +132,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -162,7 +158,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Aug 2 14:30:24 2017
@@ -136,7 +136,30 @@
<version>3.3.0</version>
<extensions>true</extensions>
<inherited>true</inherited>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.bnd</artifactId>
+ <version>1.7.2</version>
+ <exclusions>
+ <!--
+ This SCR plugin pulls in a bnd version with a
different artifactId, thus leading
+ to two bnd artifacts existing at the same time.
+ -->
+ <exclusion>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.3.0</version>
+ </dependency>
+ </dependencies>
<configuration>
+ <exportScr>true</exportScr>
<obrRepository>NONE</obrRepository>
<instructions>
<Bundle-Category>oak</Bundle-Category>
@@ -147,6 +170,8 @@
<!-- Don't default to bundle version for packages without
explicit export version.
See FELIX-5172 -->
<_nodefaultversion>true</_nodefaultversion>
+ <!-- Support parsing of maven-scr-plugin annotations through the
felix.scr.bnd plugin -->
+
<_plugin>org.apache.felix.scrplugin.bnd.SCRDescriptorBndPlugin;destdir=${project.build.outputDirectory};</_plugin>
</instructions>
</configuration>
<executions>
@@ -232,23 +257,15 @@
</filters>
</configuration>
</execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <version>1.21.0</version>
- <executions>
+ <!-- Configure extra execution of 'manifest' in process-classes
phase to make sure SCR metadata is generated before unit test runs -->
<execution>
- <id>generate-scr-scrdescriptor</id>
- <goals>
- <goal>scr</goal>
- </goals>
- <configuration>
- <properties>
- <service.vendor>The Apache Software
Foundation</service.vendor>
- </properties>
- </configuration>
+ <id>scr-metadata</id>
+ <goals>
+ <goal>manifest</goal>
+ </goals>
+ <configuration>
+ <supportIncrementalBuild>true</supportIncrementalBuild>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -327,19 +344,6 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- <versionRange>[1.7.4,)</versionRange>
- <goals>
- <goal>scr</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<versionRange>[1.7,)</versionRange>
@@ -511,8 +515,8 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
- <version>2.2.0</version>
+ <artifactId>biz.aQute.bndlib</artifactId>
+ <version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
Modified: jackrabbit/oak/trunk/oak-remote/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-remote/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-remote/pom.xml Wed Aug 2 14:30:24 2017
@@ -252,10 +252,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified: jackrabbit/oak/trunk/oak-segment-tar/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment-tar/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-segment-tar/pom.xml Wed Aug 2 14:30:24 2017
@@ -74,10 +74,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -193,7 +189,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Wed Aug 2 14:30:24 2017
@@ -81,10 +81,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -206,6 +202,12 @@
</dependency>
<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>
@@ -276,7 +278,7 @@
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/oak/trunk/oak-store-composite/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-composite/pom.xml Wed Aug 2 14:30:24 2017
@@ -53,10 +53,6 @@
</configuration>
</execution>
</executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -85,7 +81,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: jackrabbit/oak/trunk/oak-store-spi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-spi/pom.xml?rev=1803824&r1=1803823&r2=1803824&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-spi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-store-spi/pom.xml Wed Aug 2 14:30:24 2017
@@ -32,10 +32,6 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
@@ -95,7 +91,7 @@
</dependency>
<dependency>
<groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
+ <artifactId>biz.aQute.bndlib</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
