You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2015/12/15 10:01:50 UTC
svn commit: r1720093 - in /jackrabbit/trunk: jackrabbit-bundle/pom.xml
jackrabbit-jcr-commons/pom.xml jackrabbit-parent/pom.xml
Author: mreutegg
Date: Tue Dec 15 09:01:50 2015
New Revision: 1720093
URL: http://svn.apache.org/viewvc?rev=1720093&view=rev
Log:
JCR-3937: jackrabbit-jcr-commons bundle incorrectly has google dependency in Export-Package uses clause
Update to bundle plugin as suggested by David Bosschaert and Julian Sedding
Modified:
jackrabbit/trunk/jackrabbit-bundle/pom.xml
jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
jackrabbit/trunk/jackrabbit-parent/pom.xml
Modified: jackrabbit/trunk/jackrabbit-bundle/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-bundle/pom.xml?rev=1720093&r1=1720092&r2=1720093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-bundle/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-bundle/pom.xml Tue Dec 15 09:01:50 2015
@@ -48,7 +48,6 @@
org.apache.jackrabbit.api.*;version=${project.version}
</Export-Package>
<Import-Package>
- *,
<!-- Optional dependencies from jackrabbit-core -->
org.apache.jackrabbit.test;resolution:=optional,
<!-- Optional dependencies from jackrabbit-webdav -->
@@ -60,7 +59,8 @@
org.apache.xml.utils;resolution:=optional,
org.apache.xalan.serialize;resolution:=optional,
org.apache.xalan.templates;resolution:=optional,
- org.apache.derby.impl.drda;resolution:=optional
+ org.apache.derby.impl.drda;resolution:=optional,
+ *
</Import-Package>
<Bundle-Activator>
org.apache.jackrabbit.bundle.Activator
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?rev=1720093&r1=1720092&r2=1720093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Tue Dec 15 09:01:50 2015
@@ -46,8 +46,8 @@
org.apache.jackrabbit.util.Base64
</Main-Class>
<Import-Package>
- *,
- org.apache.jackrabbit.api.security.user;version="[2.2,3)";resolution:=optional
+ org.apache.jackrabbit.api.security.user;version="[2.2,3)";resolution:=optional,
+ *
</Import-Package>
</instructions>
</configuration>
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1720093&r1=1720092&r2=1720093&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Tue Dec 15 09:01:50 2015
@@ -235,7 +235,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>3.0.1</version>
<inherited>true</inherited>
<configuration>
<instructions>