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 15:07:06 UTC
svn commit: r1329224 - in /karaf/branches/karaf-2.2.x: deployer/kar/
jaas/jasypt/ shell/obr/ shell/osgi/ shell/packages/ shell/ssh/ shell/web/
shell/wrapper/ webconsole/admin/ webconsole/console/ webconsole/features/
webconsole/gogo/
Author: jbonofre
Date: Mon Apr 23 13:07:06 2012
New Revision: 1329224
URL: http://svn.apache.org/viewvc?rev=1329224&view=rev
Log:
[KARAF-1383] Fix build warning messages
Modified:
karaf/branches/karaf-2.2.x/deployer/kar/pom.xml
karaf/branches/karaf-2.2.x/jaas/jasypt/pom.xml
karaf/branches/karaf-2.2.x/shell/obr/pom.xml
karaf/branches/karaf-2.2.x/shell/osgi/pom.xml
karaf/branches/karaf-2.2.x/shell/packages/pom.xml
karaf/branches/karaf-2.2.x/shell/ssh/pom.xml
karaf/branches/karaf-2.2.x/shell/web/pom.xml
karaf/branches/karaf-2.2.x/shell/wrapper/pom.xml
karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
karaf/branches/karaf-2.2.x/webconsole/console/pom.xml
karaf/branches/karaf-2.2.x/webconsole/features/pom.xml
karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml
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=1329224&r1=1329223&r2=1329224&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 13:07:06 2012
@@ -101,7 +101,7 @@
<Bundle-SymbolicName>${project.artifactId};blueprint.graceperiod:=false</Bundle-SymbolicName>
<Import-Package>*</Import-Package>
<Private-Package>
- org.apache.karaf.deployer.features;-split-package:=merge-first
+ org.apache.karaf.deployer.kar;-split-package:=merge-first
</Private-Package>
</instructions>
</configuration>
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=1329224&r1=1329223&r2=1329224&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 13:07:06 2012
@@ -132,7 +132,6 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.jaas.encryption.impl;-split-package:=merge-first,
com.ibm.icu*;-split-package:=merge-first
</Private-Package>
</instructions>
Modified: karaf/branches/karaf-2.2.x/shell/obr/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/obr/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/obr/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/obr/pom.xml Mon Apr 23 13:07:06 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.2.x/shell/osgi/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/osgi/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/osgi/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/osgi/pom.xml Mon Apr 23 13:07:06 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.2.x/shell/packages/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/packages/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/packages/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/packages/pom.xml Mon Apr 23 13:07:06 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.2.x/shell/ssh/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/ssh/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/ssh/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/ssh/pom.xml Mon Apr 23 13:07:06 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.2.x/shell/web/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/web/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/web/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/web/pom.xml Mon Apr 23 13:07:06 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.2.x/shell/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/shell/wrapper/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/shell/wrapper/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/shell/wrapper/pom.xml Mon Apr 23 13:07:06 2012
@@ -98,7 +98,6 @@
<configuration>
<instructions>
<Import-Package>
- !${project.artifactId}*,
!org.apache.karaf.main,
!org.tanukisoftware.wrapper,
org.apache.felix.service.command,
Modified: karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/admin/pom.xml Mon Apr 23 13:07:06 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.2.x/webconsole/console/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/console/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/console/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/console/pom.xml Mon Apr 23 13:07:06 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.2.x/webconsole/features/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/features/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/features/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/features/pom.xml Mon Apr 23 13:07:06 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.2.x/webconsole/gogo/pom.xml
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml?rev=1329224&r1=1329223&r2=1329224&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml (original)
+++ karaf/branches/karaf-2.2.x/webconsole/gogo/pom.xml Mon Apr 23 13:07:06 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>