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 15:54:31 UTC
svn commit: r1535735 - in /karaf/branches/karaf-2.x: ./ diagnostic/command/
features/command/ jaas/boot/ jaas/command/ management/
management/mbeans/bundles/ management/mbeans/config/ management/mbeans/dev/
management/mbeans/log/ management/mbeans/obr/...
Author: cschneider
Date: Fri Oct 25 13:54:30 2013
New Revision: 1535735
URL: http://svn.apache.org/r1535735
Log:
KARAF-2393 Upgrade to maven bundle plugin 2.4.0
Modified:
karaf/branches/karaf-2.x/ (props changed)
karaf/branches/karaf-2.x/diagnostic/command/pom.xml
karaf/branches/karaf-2.x/features/command/pom.xml
karaf/branches/karaf-2.x/jaas/boot/pom.xml
karaf/branches/karaf-2.x/jaas/command/pom.xml
karaf/branches/karaf-2.x/management/ (props changed)
karaf/branches/karaf-2.x/management/mbeans/bundles/pom.xml
karaf/branches/karaf-2.x/management/mbeans/config/pom.xml
karaf/branches/karaf-2.x/management/mbeans/dev/pom.xml
karaf/branches/karaf-2.x/management/mbeans/log/pom.xml
karaf/branches/karaf-2.x/management/mbeans/obr/pom.xml
karaf/branches/karaf-2.x/management/mbeans/packages/pom.xml
karaf/branches/karaf-2.x/management/mbeans/services/pom.xml
karaf/branches/karaf-2.x/management/mbeans/system/pom.xml
karaf/branches/karaf-2.x/management/mbeans/web/pom.xml
karaf/branches/karaf-2.x/pom.xml
karaf/branches/karaf-2.x/shell/config/pom.xml
karaf/branches/karaf-2.x/shell/dev/pom.xml
karaf/branches/karaf-2.x/shell/log/pom.xml
karaf/branches/karaf-2.x/shell/obr/pom.xml
karaf/branches/karaf-2.x/shell/osgi/pom.xml
karaf/branches/karaf-2.x/shell/packages/pom.xml
karaf/branches/karaf-2.x/shell/web/pom.xml
karaf/branches/karaf-2.x/webconsole/console/pom.xml
Propchange: karaf/branches/karaf-2.x/
------------------------------------------------------------------------------
Merged /karaf/trunk:r1535714
Modified: karaf/branches/karaf-2.x/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/diagnostic/command/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/diagnostic/command/pom.xml (original)
+++ karaf/branches/karaf-2.x/diagnostic/command/pom.xml Fri Oct 25 13:54:30 2013
@@ -91,7 +91,6 @@
<Import-Package>
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.x/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/features/command/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.x/features/command/pom.xml Fri Oct 25 13:54:30 2013
@@ -128,9 +128,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>
- !*
- </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.x/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/boot/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/boot/pom.xml (original)
+++ karaf/branches/karaf-2.x/jaas/boot/pom.xml Fri Oct 25 13:54:30 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/branches/karaf-2.x/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/jaas/command/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/jaas/command/pom.xml (original)
+++ karaf/branches/karaf-2.x/jaas/command/pom.xml Fri Oct 25 13:54:30 2013
@@ -136,7 +136,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Propchange: karaf/branches/karaf-2.x/management/
------------------------------------------------------------------------------
Merged /karaf/trunk/management:r1535714
Modified: karaf/branches/karaf-2.x/management/mbeans/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/bundles/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/bundles/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/bundles/pom.xml Fri Oct 25 13:54:30 2013
@@ -76,8 +76,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.bundles.internal,
- !*
+ org.apache.karaf.management.mbeans.bundles.internal
</Private-Package>
</instructions>
</configuration>
@@ -85,4 +84,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/management/mbeans/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/config/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/config/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/config/pom.xml Fri Oct 25 13:54:30 2013
@@ -94,8 +94,7 @@
</Import-Package>
<Private-Package>
org.apache.karaf.management.mbeans.config.internal,
- org.apache.felix.utils.properties;-split-package:=merge-first,
- !*
+ org.apache.felix.utils.properties;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/management/mbeans/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/dev/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/dev/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/dev/pom.xml Fri Oct 25 13:54:30 2013
@@ -82,8 +82,7 @@
</Import-Package>
<Private-Package>
org.apache.karaf.management.mbeans.dev.internal,
- org.apache.felix.utils.properties,
- !*
+ org.apache.felix.utils.properties
</Private-Package>
</instructions>
</configuration>
@@ -91,4 +90,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/management/mbeans/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/log/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/log/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/log/pom.xml Fri Oct 25 13:54:30 2013
@@ -90,8 +90,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.log.internal,
- !*
+ org.apache.karaf.management.mbeans.log.internal
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/management/mbeans/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/obr/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/obr/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/obr/pom.xml Fri Oct 25 13:54:30 2013
@@ -81,8 +81,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.obr.internal,
- !*
+ org.apache.karaf.management.mbeans.obr.internal
</Private-Package>
</instructions>
</configuration>
@@ -90,4 +89,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/management/mbeans/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/packages/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/packages/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/packages/pom.xml Fri Oct 25 13:54:30 2013
@@ -77,8 +77,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.packages.internal,
- !*
+ org.apache.karaf.management.mbeans.packages.internal
</Private-Package>
</instructions>
</configuration>
@@ -86,4 +85,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/management/mbeans/services/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/services/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/services/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/services/pom.xml Fri Oct 25 13:54:30 2013
@@ -77,8 +77,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.services.internal,
- !*
+ org.apache.karaf.management.mbeans.services.internal
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/management/mbeans/system/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/system/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/system/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/system/pom.xml Fri Oct 25 13:54:30 2013
@@ -90,8 +90,7 @@
</Import-Package>
<Private-Package>
org.apache.karaf.management.mbeans.system.internal,
- org.apache.felix.utils*,
- !*
+ org.apache.felix.utils*
</Private-Package>
</instructions>
</configuration>
@@ -99,4 +98,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/management/mbeans/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/management/mbeans/web/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/management/mbeans/web/pom.xml (original)
+++ karaf/branches/karaf-2.x/management/mbeans/web/pom.xml Fri Oct 25 13:54:30 2013
@@ -76,8 +76,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.web.internal,
- !*
+ org.apache.karaf.management.mbeans.web.internal
</Private-Package>
</instructions>
</configuration>
@@ -85,4 +84,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: karaf/branches/karaf-2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/pom.xml (original)
+++ karaf/branches/karaf-2.x/pom.xml Fri Oct 25 13:54:30 2013
@@ -131,7 +131,7 @@
<felix.fileinstall.version>3.2.6</felix.fileinstall.version>
<felix.framework.version>4.0.3</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/branches/karaf-2.x/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/config/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/config/pom.xml Fri Oct 25 13:54:30 2013
@@ -107,8 +107,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.felix.utils*;-split-package:=merge-first,
- !*
+ org.apache.felix.utils*;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/dev/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/dev/pom.xml Fri Oct 25 13:54:30 2013
@@ -107,8 +107,7 @@
</Import-Package>
<Private-Package>
org.apache.felix.utils*;-split-package:=merge-first,
- org.ops4j.pax.url.mvn,
- !*
+ org.ops4j.pax.url.mvn
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/log/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/log/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/log/pom.xml Fri Oct 25 13:54:30 2013
@@ -100,7 +100,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.x/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/obr/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/obr/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/obr/pom.xml Fri Oct 25 13:54:30 2013
@@ -101,7 +101,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/osgi/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/osgi/pom.xml Fri Oct 25 13:54:30 2013
@@ -116,8 +116,7 @@
</DynamicImport-Package>
<Private-Package>
org.apache.karaf.util;-split-package:=merge-first,
- org.apache.felix.utils*;-split-package:=merge-first,
- !*
+ org.apache.felix.utils*;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.x/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/packages/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/packages/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/packages/pom.xml Fri Oct 25 13:54:30 2013
@@ -90,7 +90,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.x/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/shell/web/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/shell/web/pom.xml (original)
+++ karaf/branches/karaf-2.x/shell/web/pom.xml Fri Oct 25 13:54:30 2013
@@ -98,8 +98,7 @@
</Import-Package>
<Private-Package>
org.apache.felix.utils.version;-split-package:=merge-first,
- org.apache.felix.utils.manifest;-split-package:=merge-first,
- !*
+ org.apache.felix.utils.manifest;-split-package:=merge-first
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
Modified: karaf/branches/karaf-2.x/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/webconsole/console/pom.xml?rev=1535735&r1=1535734&r2=1535735&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.x/webconsole/console/pom.xml Fri Oct 25 13:54:30 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>