You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/10/25 14:44:02 UTC
svn commit: r1535714 - in /karaf/trunk: ./ config/command/
diagnostic/command/ features/command/ http/command/ jaas/boot/
jaas/command/ management/boot/ region/command/ service/command/
shell/table/ webconsole/console/
Author: cschneider
Date: Fri Oct 25 12:44:02 2013
New Revision: 1535714
URL: http://svn.apache.org/r1535714
Log:
KARAF-2393 Upgrade to maven bundle plugin 2.4.0
Modified:
karaf/trunk/config/command/pom.xml
karaf/trunk/diagnostic/command/pom.xml
karaf/trunk/features/command/pom.xml
karaf/trunk/http/command/pom.xml
karaf/trunk/jaas/boot/pom.xml
karaf/trunk/jaas/command/pom.xml
karaf/trunk/management/boot/pom.xml
karaf/trunk/pom.xml
karaf/trunk/region/command/pom.xml
karaf/trunk/service/command/pom.xml
karaf/trunk/shell/table/pom.xml
karaf/trunk/webconsole/console/pom.xml
Modified: karaf/trunk/config/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/config/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/config/command/pom.xml (original)
+++ karaf/trunk/config/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -97,14 +97,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- *
- </Import-Package>
- <Private-Package>!*</Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: karaf/trunk/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/diagnostic/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/diagnostic/command/pom.xml (original)
+++ karaf/trunk/diagnostic/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -93,7 +93,6 @@
org.osgi.service.blueprint.reflect,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/trunk/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/features/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/features/command/pom.xml (original)
+++ karaf/trunk/features/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -96,7 +96,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/trunk/http/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/http/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/http/command/pom.xml (original)
+++ karaf/trunk/http/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -120,8 +120,7 @@
<Private-Package>
org.apache.felix.utils.version,
org.apache.felix.utils.manifest,
- org.apache.karaf.util;-split-package:=merge-first,
- !*
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
Modified: karaf/trunk/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/boot/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/jaas/boot/pom.xml (original)
+++ karaf/trunk/jaas/boot/pom.xml Fri Oct 25 12:44:02 2013
@@ -65,12 +65,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: karaf/trunk/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/jaas/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/jaas/command/pom.xml (original)
+++ karaf/trunk/jaas/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -120,7 +120,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/trunk/management/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/management/boot/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/management/boot/pom.xml (original)
+++ karaf/trunk/management/boot/pom.xml Fri Oct 25 12:44:02 2013
@@ -57,12 +57,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: karaf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/pom.xml (original)
+++ karaf/trunk/pom.xml Fri Oct 25 12:44:02 2013
@@ -150,7 +150,7 @@
<felix.fileinstall.version>3.2.6</felix.fileinstall.version>
<felix.framework.version>4.2.1</felix.framework.version>
<felix.gogo.version>0.10.0</felix.gogo.version>
- <felix.plugin.version>2.3.7</felix.plugin.version>
+ <felix.plugin.version>2.4.0</felix.plugin.version>
<felix.utils.version>1.2.0</felix.utils.version>
<felix.webconsole.version>4.2.0</felix.webconsole.version>
<felix.webconsole.api.version>3.1.2</felix.webconsole.api.version>
Modified: karaf/trunk/region/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/region/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/region/command/pom.xml (original)
+++ karaf/trunk/region/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -95,14 +95,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Import-Package>
- *
- </Import-Package>
- <Private-Package>!*</Private-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: karaf/trunk/service/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/service/command/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/service/command/pom.xml (original)
+++ karaf/trunk/service/command/pom.xml Fri Oct 25 12:44:02 2013
@@ -92,12 +92,8 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/trunk/shell/table/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/shell/table/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/shell/table/pom.xml (original)
+++ karaf/trunk/shell/table/pom.xml Fri Oct 25 12:44:02 2013
@@ -66,10 +66,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
Modified: karaf/trunk/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/webconsole/console/pom.xml?rev=1535714&r1=1535713&r2=1535714&view=diff
==============================================================================
--- karaf/trunk/webconsole/console/pom.xml (original)
+++ karaf/trunk/webconsole/console/pom.xml Fri Oct 25 12:44:02 2013
@@ -103,7 +103,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>${felix.plugin.version}</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -132,6 +131,14 @@
org.osgi.service.prefs;resolution:=optional,
javax.portlet;resolution:=optional,
javax.servlet.*,
+ !org.apache.felix.bundlerepository,
+ !org.osgi.service.obr,
+ !org.osgi.service.cm,
+ !org.osgi.service.condpermadmin,
+ !org.osgi.service.log,
+ !org.osgi.service.metatype,
+ !org.osgi.service.permissionadmin,
+ !org.osgi.service.wireadmin,
*
</Import-Package>
<DynamicImport-Package>