You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/04/25 10:43:02 UTC
svn commit: r1330155 - in /karaf/branches/karaf-2.3.x: admin/core/
admin/management/ deployer/blueprint/ deployer/features/ deployer/kar/
deployer/spring/ deployer/wrap/ diagnostic/command/ diagnostic/common/
diagnostic/core/ diagnostic/management/ fea...
Author: jbonofre
Date: Wed Apr 25 08:42:59 2012
New Revision: 1330155
URL: http://svn.apache.org/viewvc?rev=1330155&view=rev
Log:
[KARAF-1383] Fix build warning messages
Modified:
karaf/branches/karaf-2.3.x/admin/core/pom.xml
karaf/branches/karaf-2.3.x/admin/management/pom.xml
karaf/branches/karaf-2.3.x/deployer/blueprint/pom.xml
karaf/branches/karaf-2.3.x/deployer/features/pom.xml
karaf/branches/karaf-2.3.x/deployer/kar/pom.xml
karaf/branches/karaf-2.3.x/deployer/spring/pom.xml
karaf/branches/karaf-2.3.x/deployer/wrap/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/core/pom.xml
karaf/branches/karaf-2.3.x/diagnostic/management/pom.xml
karaf/branches/karaf-2.3.x/features/command/pom.xml
karaf/branches/karaf-2.3.x/features/core/pom.xml
karaf/branches/karaf-2.3.x/features/management/pom.xml
karaf/branches/karaf-2.3.x/features/obr/pom.xml
karaf/branches/karaf-2.3.x/jaas/boot/pom.xml
karaf/branches/karaf-2.3.x/jaas/command/pom.xml
karaf/branches/karaf-2.3.x/jaas/jasypt/pom.xml
karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
karaf/branches/karaf-2.3.x/main/pom.xml
karaf/branches/karaf-2.3.x/management/mbeans/bundles/pom.xml
karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml
karaf/branches/karaf-2.3.x/management/mbeans/web/pom.xml
karaf/branches/karaf-2.3.x/management/server/pom.xml
karaf/branches/karaf-2.3.x/shell/commands/pom.xml
karaf/branches/karaf-2.3.x/shell/config/pom.xml
karaf/branches/karaf-2.3.x/shell/console/pom.xml
karaf/branches/karaf-2.3.x/shell/dev/pom.xml
karaf/branches/karaf-2.3.x/shell/log/pom.xml
karaf/branches/karaf-2.3.x/shell/obr/pom.xml
karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
karaf/branches/karaf-2.3.x/shell/packages/pom.xml
karaf/branches/karaf-2.3.x/shell/ssh/pom.xml
karaf/branches/karaf-2.3.x/shell/web/pom.xml
karaf/branches/karaf-2.3.x/shell/wrapper/pom.xml
karaf/branches/karaf-2.3.x/webconsole/admin/pom.xml
karaf/branches/karaf-2.3.x/webconsole/console/pom.xml
karaf/branches/karaf-2.3.x/webconsole/features/pom.xml
karaf/branches/karaf-2.3.x/webconsole/gogo/pom.xml
Modified: karaf/branches/karaf-2.3.x/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/core/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/core/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/core/pom.xml Wed Apr 25 08:42:59 2012
@@ -167,7 +167,6 @@
</Export-Package>
<Import-Package>
!org.apache.karaf.admin,
- !org.apache.karaf.jpm,
javax.management,
javax.management.loading,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.3.x/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/admin/management/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/admin/management/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/admin/management/pom.xml Wed Apr 25 08:42:59 2012
@@ -92,7 +92,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
javax.management,
javax.management.loading,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.3.x/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/blueprint/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/blueprint/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/blueprint/pom.xml Wed Apr 25 08:42:59 2012
@@ -100,7 +100,7 @@
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>
org.apache.karaf.deployer.blueprint,
org.apache.karaf.util
Modified: karaf/branches/karaf-2.3.x/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/features/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/features/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/features/pom.xml Wed Apr 25 08:42:59 2012
@@ -98,10 +98,10 @@
<!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>
org.apache.karaf.deployer.features,
- org.apache.karaf.util
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.3.x/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/kar/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/kar/pom.xml Wed Apr 25 08:42:59 2012
@@ -99,8 +99,8 @@
<!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
- <Private-Package>org.apache.karaf.deployer.features</Private-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>org.apache.karaf.deployer.kar</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.3.x/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/spring/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/spring/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/spring/pom.xml Wed Apr 25 08:42:59 2012
@@ -99,7 +99,7 @@
<!-- Set the blueprint.graceperiod flag to false to allow the bundle to start
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>
org.apache.karaf.deployer.spring,
org.apache.karaf.util
Modified: karaf/branches/karaf-2.3.x/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/deployer/wrap/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/deployer/wrap/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/deployer/wrap/pom.xml Wed Apr 25 08:42:59 2012
@@ -83,7 +83,7 @@
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>
org.apache.karaf.deployer.wrap,
org.apache.karaf.util
Modified: karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/command/pom.xml Wed Apr 25 08:42:59 2012
@@ -82,7 +82,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
<Private-Package>!*</Private-Package>
Modified: karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/common/pom.xml Wed Apr 25 08:42:59 2012
@@ -85,7 +85,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/diagnostic/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/core/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/core/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/core/pom.xml Wed Apr 25 08:42:59 2012
@@ -64,12 +64,8 @@
${project.artifactId}.common;version=${project.version};-noimport:=true,
</Export-Package>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
- <Private-Package>
- org.apache.karaf.diagnostic.internal
- </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.3.x/diagnostic/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/diagnostic/management/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/diagnostic/management/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/diagnostic/management/pom.xml Wed Apr 25 08:42:59 2012
@@ -85,7 +85,6 @@
${project.artifactId}*;version=${project.version}
</Export-Package>
<Import-Package>
- !${project.artifactId}*,
javax.management,
javax.management.loading,
*
Modified: karaf/branches/karaf-2.3.x/features/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/command/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/command/pom.xml Wed Apr 25 08:42:59 2012
@@ -115,7 +115,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
javax.management,
javax.management.loading,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.3.x/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/core/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/core/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/core/pom.xml Wed Apr 25 08:42:59 2012
@@ -122,8 +122,8 @@
</Import-Package>
<Private-Package>
org.apache.karaf.features.internal,
- org.apache.felix.utils.version,
- org.apache.felix.utils.manifest
+ org.apache.felix.utils.version;-split-package:=merge-first,
+ org.apache.felix.utils.manifest;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.3.x/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/management/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/management/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/management/pom.xml Wed Apr 25 08:42:59 2012
@@ -120,7 +120,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
javax.management,
javax.management.loading,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.3.x/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/features/obr/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/features/obr/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/features/obr/pom.xml Wed Apr 25 08:42:59 2012
@@ -85,7 +85,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
<Private-Package>org.apache.karaf.features.obr.internal</Private-Package>
Modified: karaf/branches/karaf-2.3.x/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/boot/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/boot/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/boot/pom.xml Wed Apr 25 08:42:59 2012
@@ -67,7 +67,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.3.x/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/command/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/command/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/command/pom.xml Wed Apr 25 08:42:59 2012
@@ -122,7 +122,6 @@
<instructions>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${project.artifactId}*,
javax.management,
javax.management.loading,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.3.x/jaas/jasypt/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/jasypt/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/jasypt/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/jasypt/pom.xml Wed Apr 25 08:42:59 2012
@@ -129,11 +129,10 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
<Private-Package>
- org.apache.karaf.jaas.encryption.impl,
+ org.apache.karaf.jaas.jasypt.impl,
com.ibm.icu*
</Private-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/jaas/modules/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/jaas/modules/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/jaas/modules/pom.xml Wed Apr 25 08:42:59 2012
@@ -106,7 +106,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.karaf.jaas.config,
org.apache.aries.blueprint.ext,
*
Modified: karaf/branches/karaf-2.3.x/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/main/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/main/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/main/pom.xml Wed Apr 25 08:42:59 2012
@@ -110,7 +110,7 @@
-->
<Private-Package>
org.apache.karaf.main*,
- org.osgi.*
+ org.osgi.*;-split-package:=merge-first
</Private-Package>
</instructions>
<unpackBundle>true</unpackBundle>
Modified: karaf/branches/karaf-2.3.x/management/mbeans/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/bundles/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/bundles/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/bundles/pom.xml Wed Apr 25 08:42:59 2012
@@ -70,7 +70,6 @@
org.apache.karaf.management.mbeans.bundles;version=${project.version}
</Export-Package>
<Import-Package>
- !org.apache.karaf.management.mbeans.bundles.internal,
javax.management,
javax.management.loading,
org.apache.karaf.management;version=${project.version},
Modified: karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/config/pom.xml Wed Apr 25 08:42:59 2012
@@ -87,7 +87,6 @@
org.apache.karaf.management.mbeans.config*;version=${project.version}
</Export-Package>
<Import-Package>
- !org.apache.karaf.management.mbeans.config*,
javax.management,
javax.management.loading,
org.apache.karaf.management;version=${project.version},
@@ -95,7 +94,7 @@
</Import-Package>
<Private-Package>
org.apache.karaf.management.mbeans.config.internal,
- org.apache.felix.utils.properties,
+ org.apache.felix.utils.properties;-split-package:=merge-first,
!*
</Private-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/management/mbeans/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/mbeans/web/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/mbeans/web/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/mbeans/web/pom.xml Wed Apr 25 08:42:59 2012
@@ -70,7 +70,6 @@
org.apache.karaf.management.mbeans.web;version=${project.version}
</Export-Package>
<Import-Package>
- !org.apache.karaf.management.mbeans.system,
javax.management,
javax.management.loading,
org.apache.karaf.management;version=${project.version},
Modified: karaf/branches/karaf-2.3.x/management/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/management/server/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/management/server/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/management/server/pom.xml Wed Apr 25 08:42:59 2012
@@ -97,7 +97,6 @@
org.apache.karaf.management;version=${project.version}
</Export-Package>
<Import-Package>
- !${project.artifactId}*,
javax.management,
*
</Import-Package>
Modified: karaf/branches/karaf-2.3.x/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/commands/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/commands/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/commands/pom.xml Wed Apr 25 08:42:59 2012
@@ -90,14 +90,13 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util.process
+ org.apache.karaf.util.process;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.3.x/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/config/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/config/pom.xml Wed Apr 25 08:42:59 2012
@@ -93,14 +93,13 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util,
+ org.apache.karaf.util;-split-package:=merge-first,
!*
</Private-Package>
</instructions>
Modified: karaf/branches/karaf-2.3.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/console/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/console/pom.xml Wed Apr 25 08:42:59 2012
@@ -114,31 +114,23 @@
<configuration>
<instructions>
<Import-Package>
- !org.apache.karaf.shell.console*,
- !org.apache.karaf.util*,
- !org.apache.felix.gogo.commands*,
- !org.fusesource.jansi*,
- !javax.swing,
- !jline,
- com.sun.jna*;resolution:=optional,
org.osgi.service.event;resolution:=optional,
org.apache.karaf.branding;resolution:=optional,
*
</Import-Package>
<Export-Package>
- org.apache.felix.gogo*;version=${felix.gogo.version},
+ org.apache.felix.gogo*;version=${felix.gogo.version};-split-package:=merge-first,
org.apache.felix.service.command;version=${felix.gogo.version};status=provisional;mandatory:=status,
org.apache.felix.service.threadio;version=${felix.gogo.version};status=provisional;mandatory:=status,
org.apache.karaf.shell.console*;version=${project.version},
- org.fusesource.jansi;version=${jansi.version},
+ org.fusesource.jansi;version=${jansi.version};-split-package:=merge-first,
jline*;version=${jline.version},
- org.fusesource.hawtjni*;version=1.0
+ org.fusesource.hawtjni*;version=1.0;-split-package:=merge-first
</Export-Package>
<Private-Package>
- org.fusesource.jansi.internal,
- org.apache.felix.gogo.runtime*,
- org.apache.karaf.util*,
- META-INF.native.*
+ org.fusesource.jansi.internal;-split-package:=merge-first,
+ org.apache.karaf.util*;-split-package:=merge-first,
+ META-INF.native.*;-split-package:=merge-first
</Private-Package>
<Bundle-NativeCode>
META-INF/native/windows32/jansi.dll;osname=Win32;processor=x86,
Modified: karaf/branches/karaf-2.3.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/dev/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/dev/pom.xml Wed Apr 25 08:42:59 2012
@@ -99,7 +99,6 @@
<instructions>
<Embed-Dependency>pax-url-mvn</Embed-Dependency>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
@@ -108,7 +107,7 @@
<Private-Package>
org.apache.felix.utils.properties,
org.apache.felix.utils.version,
- org.apache.karaf.util,
+ org.apache.karaf.util;-split-package:=merge-first,
org.ops4j.pax.url.mvn,
!*
</Private-Package>
Modified: karaf/branches/karaf-2.3.x/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/log/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/log/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/log/pom.xml Wed Apr 25 08:42:59 2012
@@ -89,7 +89,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
Modified: karaf/branches/karaf-2.3.x/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/obr/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/obr/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/obr/pom.xml Wed Apr 25 08:42:59 2012
@@ -89,7 +89,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
Modified: karaf/branches/karaf-2.3.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/osgi/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/osgi/pom.xml Wed Apr 25 08:42:59 2012
@@ -97,7 +97,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
@@ -108,7 +107,7 @@
org.springframework.*
</DynamicImport-Package>
<Private-Package>
- org.apache.karaf.util,
+ org.apache.karaf.util;-split-package:=merge-first,
org.apache.felix.utils.version,
org.apache.felix.utils.manifest,
!*
Modified: karaf/branches/karaf-2.3.x/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/packages/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/packages/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/packages/pom.xml Wed Apr 25 08:42:59 2012
@@ -79,7 +79,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
Modified: karaf/branches/karaf-2.3.x/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/ssh/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/ssh/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/ssh/pom.xml Wed Apr 25 08:42:59 2012
@@ -90,7 +90,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
@@ -98,7 +97,6 @@
org.apache.sshd.server.jaas,
*
</Import-Package>
- <Private-Package>org.apache.karaf.jpm.*</Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.3.x/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/web/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/web/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/web/pom.xml Wed Apr 25 08:42:59 2012
@@ -84,7 +84,6 @@
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
- !${project.artifactId}*,
org.apache.felix.service.command,
org.apache.felix.gogo.commands,
org.apache.karaf.shell.console,
Modified: karaf/branches/karaf-2.3.x/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/shell/wrapper/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/shell/wrapper/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/shell/wrapper/pom.xml Wed Apr 25 08:42:59 2012
@@ -98,7 +98,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
!org.apache.karaf.main,
!org.tanukisoftware.wrapper,
org.apache.felix.service.command,
@@ -107,7 +106,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util.process
+ org.apache.karaf.util.process;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.3.x/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/admin/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/admin/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/admin/pom.xml Wed Apr 25 08:42:59 2012
@@ -113,7 +113,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
Modified: karaf/branches/karaf-2.3.x/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/console/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/console/pom.xml Wed Apr 25 08:42:59 2012
@@ -124,7 +124,7 @@
</Export-Package>
<Private-Package>
!org.apache.felix.webconsole,
- org.apache.felix.webconsole.*,
+ org.apache.felix.webconsole.*;-split-package:=merge-first
</Private-Package>
<Import-Package>
org.apache.felix.scr;version=1.0;resolution:=optional,
Modified: karaf/branches/karaf-2.3.x/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/features/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/features/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/features/pom.xml Wed Apr 25 08:42:59 2012
@@ -98,7 +98,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>!${project.artifactId}*,*</Import-Package>
+ <Import-Package>*</Import-Package>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
<!-- TODO: this needs to be put in a common place for reuse. -->
Modified: karaf/branches/karaf-2.3.x/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.3.x/webconsole/gogo/pom.xml?rev=1330155&r1=1330154&r2=1330155&view=diff
==============================================================================
--- karaf/branches/karaf-2.3.x/webconsole/gogo/pom.xml (original)
+++ karaf/branches/karaf-2.3.x/webconsole/gogo/pom.xml Wed Apr 25 08:42:59 2012
@@ -98,7 +98,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Import-Package>!${project.artifactId}*,
+ <Import-Package>
jline;version="[${jline.version}, ${jline.version}]",
*
</Import-Package>