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/23 10:57:11 UTC
svn commit: r1329137 - in /karaf/branches/karaf-2.2.x: ./ admin/command/
admin/core/ admin/management/ deployer/blueprint/ deployer/features/
deployer/kar/ deployer/spring/ deployer/wrap/ diagnostic/management/
features/core/ features/management/ featu...
Author: jbonofre
Date: Mon Apr 23 08:57:10 2012
New Revision: 1329137
URL: http://svn.apache.org/viewvc?rev=1329137&view=rev
Log:
[KARAF-1383] Fix build warning messages
Modified:
karaf/branches/karaf-2.2.x/admin/command/pom.xml
karaf/branches/karaf-2.2.x/admin/core/pom.xml
karaf/branches/karaf-2.2.x/admin/management/pom.xml
karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml
karaf/branches/karaf-2.2.x/deployer/features/pom.xml
karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
karaf/branches/karaf-2.2.x/deployer/spring/pom.xml
karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml
karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
karaf/branches/karaf-2.2.x/features/core/pom.xml
karaf/branches/karaf-2.2.x/features/management/pom.xml
karaf/branches/karaf-2.2.x/features/obr/pom.xml
karaf/branches/karaf-2.2.x/jaas/boot/pom.xml
karaf/branches/karaf-2.2.x/jaas/command/pom.xml
karaf/branches/karaf-2.2.x/jaas/config/pom.xml
karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml
karaf/branches/karaf-2.2.x/jaas/modules/pom.xml
karaf/branches/karaf-2.2.x/main/pom.xml
karaf/branches/karaf-2.2.x/management/mbeans/bundles/pom.xml
karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml
karaf/branches/karaf-2.2.x/management/server/pom.xml
karaf/branches/karaf-2.2.x/pom.xml
karaf/branches/karaf-2.2.x/shell/commands/pom.xml
karaf/branches/karaf-2.2.x/shell/config/pom.xml
karaf/branches/karaf-2.2.x/shell/console/pom.xml
karaf/branches/karaf-2.2.x/shell/dev/pom.xml
karaf/branches/karaf-2.2.x/shell/log/pom.xml
Modified: karaf/branches/karaf-2.2.x/admin/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/command/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/command/pom.xml Mon Apr 23 08:57:10 2012
@@ -113,7 +113,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.admin.main
+ org.apache.karaf.admin.main;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/admin/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/core/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/core/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/core/pom.xml Mon Apr 23 08:57:10 2012
@@ -175,10 +175,10 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.admin.bin,
- org.apache.karaf.admin.etc,
- org.apache.karaf.admin.internal,
- org.apache.karaf.jpm.impl,
+ org.apache.karaf.admin.bin;-split-package:=merge-first,
+ org.apache.karaf.admin.etc;-split-package:=merge-first,
+ org.apache.karaf.admin.internal;-split-package:=merge-first,
+ org.apache.karaf.jpm.impl;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/admin/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/admin/management/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/admin/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/admin/management/pom.xml Mon Apr 23 08:57:10 2012
@@ -99,7 +99,9 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>org.apache.karaf.admin.management.internal</Private-Package>
+ <Private-Package>
+ org.apache.karaf.admin.management.internal;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/blueprint/pom.xml Mon Apr 23 08:57:10 2012
@@ -102,8 +102,8 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>
- org.apache.karaf.deployer.blueprint,
- org.apache.karaf.util
+ org.apache.karaf.deployer.blueprint;-split-package:=merge-first,
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/deployer/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/features/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/features/pom.xml Mon Apr 23 08:57:10 2012
@@ -100,8 +100,8 @@
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Private-Package>
- org.apache.karaf.deployer.features,
- org.apache.karaf.util
+ org.apache.karaf.deployer.features;-split-package:=merge-first,
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/kar/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/kar/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/kar/pom.xml Mon Apr 23 08:57:10 2012
@@ -100,7 +100,9 @@
See the blueprint config file -->
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
- <Private-Package>org.apache.karaf.deployer.features</Private-Package>
+ <Private-Package>
+ org.apache.karaf.deployer.features;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/deployer/spring/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/spring/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/spring/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/spring/pom.xml Mon Apr 23 08:57:10 2012
@@ -101,8 +101,8 @@
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Private-Package>
- org.apache.karaf.deployer.spring,
- org.apache.karaf.util
+ org.apache.karaf.deployer.spring;-split-package:=merge-first,
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/deployer/wrap/pom.xml Mon Apr 23 08:57:10 2012
@@ -85,8 +85,8 @@
<Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>
- org.apache.karaf.deployer.wrap,
- org.apache.karaf.util
+ org.apache.karaf.deployer.wrap;-split-package:=merge-first,
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
Modified: karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/diagnostic/management/pom.xml Mon Apr 23 08:57:10 2012
@@ -89,7 +89,9 @@
javax.management.loading,
*
</Import-Package>
- <Private-Package>org.apache.karaf.diagnostic.management.internal</Private-Package>
+ <Private-Package>
+ org.apache.karaf.diagnostic.management.internal;-split-package:=merge-first
+ </Private-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/features/core/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/core/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/core/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/core/pom.xml Mon Apr 23 08:57:10 2012
@@ -121,9 +121,9 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.features.internal,
- org.apache.felix.utils.version,
- org.apache.felix.utils.manifest
+ org.apache.karaf.features.internal;-split-package:=merge-first,
+ 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.2.x/features/management/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/management/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/management/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/management/pom.xml Mon Apr 23 08:57:10 2012
@@ -127,7 +127,9 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>org.apache.karaf.features.management.internal</Private-Package>
+ <Private-Package>
+ org.apache.karaf.features.management.internal;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/features/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/features/obr/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/features/obr/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/features/obr/pom.xml Mon Apr 23 08:57:10 2012
@@ -87,7 +87,9 @@
<Import-Package>
*
</Import-Package>
- <Private-Package>org.apache.karaf.features.obr.internal</Private-Package>
+ <Private-Package>
+ org.apache.karaf.features.obr.internal;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/jaas/boot/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/boot/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/boot/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/boot/pom.xml Mon Apr 23 08:57:10 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.2.x/jaas/command/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/command/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/command/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/command/pom.xml Mon Apr 23 08:57:10 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.2.x/jaas/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/config/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/config/pom.xml Mon Apr 23 08:57:10 2012
@@ -89,7 +89,9 @@
<instructions>
<Export-Package>${project.artifactId};version=${project.version}</Export-Package>
<Import-Package>!${project.artifactId},*</Import-Package>
- <Private-Package>${project.artifactId}.impl</Private-Package>
+ <Private-Package>
+ ${project.artifactId}.impl;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
Modified: karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml Mon Apr 23 08:57:10 2012
@@ -129,12 +129,11 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
*
</Import-Package>
<Private-Package>
- org.apache.karaf.jaas.encryption.impl,
- com.ibm.icu*
+ org.apache.karaf.jaas.encryption.impl;-split-package:=merge-first,
+ com.ibm.icu*;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/jaas/modules/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/modules/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/modules/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/jaas/modules/pom.xml Mon Apr 23 08:57:10 2012
@@ -106,13 +106,12 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
org.apache.karaf.jaas.config,
org.apache.aries.blueprint.ext,
*
</Import-Package>
<Private-Package>
- org.apache.karaf.util
+ org.apache.karaf.util;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/main/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/main/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/main/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/main/pom.xml Mon Apr 23 08:57:10 2012
@@ -109,8 +109,8 @@
<Import-Package>!*</Import-Package>
-->
<Private-Package>
- org.apache.karaf.main*,
- org.osgi.*
+ org.apache.karaf.main*;-split-package:=merge-first,
+ org.osgi.*;-split-package:=merge-first
</Private-Package>
</instructions>
<unpackBundle>true</unpackBundle>
Modified: karaf/branches/karaf-2.2.x/management/mbeans/bundles/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/bundles/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/mbeans/bundles/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/mbeans/bundles/pom.xml Mon Apr 23 08:57:10 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.2.x/management/mbeans/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/mbeans/config/pom.xml Mon Apr 23 08:57:10 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.2.x/management/server/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/management/server/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/management/server/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/management/server/pom.xml Mon Apr 23 08:57:10 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.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/pom.xml Mon Apr 23 08:57:10 2012
@@ -1092,7 +1092,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Export-Package>${project.artifactId}*;version=${project.version}</Export-Package>
+ <Export-Package>${project.artifactId}*;version=${project.version};-split-package:=merge-first</Export-Package>
<_versionpolicy>${bnd.version.policy}</_versionpolicy>
</instructions>
</configuration>
Modified: karaf/branches/karaf-2.2.x/shell/commands/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/commands/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/commands/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/commands/pom.xml Mon Apr 23 08:57:10 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,
Modified: karaf/branches/karaf-2.2.x/shell/config/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/config/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/config/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/config/pom.xml Mon Apr 23 08:57:10 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.2.x/shell/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/console/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/console/pom.xml Mon Apr 23 08:57:10 2012
@@ -110,29 +110,23 @@
<configuration>
<instructions>
<Import-Package>
- !org.apache.karaf.shell.console*,
- !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.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},
- jline*;version=${jline.version},
- org.fusesource.hawtjni*;version=1.0
+ 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;-split-package:=merge-first,
+ org.apache.felix.service.threadio;version=${felix.gogo.version};status=provisional;mandatory:=status;-split-package:=merge-first,
+ org.apache.karaf.shell.console*;version=${project.version};-split-package:=merge-first,
+ org.fusesource.jansi;version=${jansi.version};-split-package:=merge-first,
+ jline*;version=${jline.version};-split-package:=merge-first,
+ org.fusesource.hawtjni*;version=1.0;-split-package:=merge-first
</Export-Package>
<Private-Package>
- org.fusesource.jansi.internal,
- org.apache.felix.gogo.runtime*,
- META-INF.native.*
+ org.fusesource.jansi.internal;-split-package:=merge-first,
+ org.apache.felix.gogo.runtime*;-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.2.x/shell/dev/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/dev/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/dev/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/dev/pom.xml Mon Apr 23 08:57:10 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,
@@ -107,7 +106,7 @@
</Import-Package>
<Private-Package>
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.2.x/shell/log/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/log/pom.xml?rev=1329137&r1=1329136&r2=1329137&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/log/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/log/pom.xml Mon Apr 23 08:57:10 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,