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 2014/01/20 18:35:30 UTC
git commit: [KARAF-2393] Upgrade to Felix maven-bundle-plugin 2.4.0
Updated Branches:
refs/heads/karaf-2.3.x eda2e032b -> dc4234540
[KARAF-2393] Upgrade to Felix maven-bundle-plugin 2.4.0
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dc423454
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dc423454
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dc423454
Branch: refs/heads/karaf-2.3.x
Commit: dc423454069e31a4a95e9fd75dbb8289c6125ff8
Parents: eda2e03
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Jan 20 18:34:53 2014 +0100
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Jan 20 18:34:53 2014 +0100
----------------------------------------------------------------------
diagnostic/command/pom.xml | 1 -
features/command/pom.xml | 3 ---
jaas/boot/pom.xml | 6 ------
jaas/command/pom.xml | 1 -
management/mbeans/bundles/pom.xml | 5 ++---
management/mbeans/config/pom.xml | 3 +--
management/mbeans/dev/pom.xml | 5 ++---
management/mbeans/log/pom.xml | 3 +--
management/mbeans/obr/pom.xml | 5 ++---
management/mbeans/packages/pom.xml | 5 ++---
management/mbeans/services/pom.xml | 3 +--
management/mbeans/system/pom.xml | 5 ++---
management/mbeans/web/pom.xml | 5 ++---
shell/config/pom.xml | 3 +--
shell/dev/pom.xml | 3 +--
shell/log/pom.xml | 1 -
shell/obr/pom.xml | 1 -
shell/osgi/pom.xml | 3 +--
shell/packages/pom.xml | 1 -
shell/web/pom.xml | 3 +--
webconsole/console/pom.xml | 9 ++++++++-
21 files changed, 27 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/diagnostic/command/pom.xml
----------------------------------------------------------------------
diff --git a/diagnostic/command/pom.xml b/diagnostic/command/pom.xml
index 596ab79..e68cfff 100644
--- a/diagnostic/command/pom.xml
+++ b/diagnostic/command/pom.xml
@@ -91,7 +91,6 @@
<Import-Package>
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/features/command/pom.xml
----------------------------------------------------------------------
diff --git a/features/command/pom.xml b/features/command/pom.xml
index cbaa14c..b2a1649 100644
--- a/features/command/pom.xml
+++ b/features/command/pom.xml
@@ -128,9 +128,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>
- !*
- </Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/jaas/boot/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/boot/pom.xml b/jaas/boot/pom.xml
index 20de2b1..b6c9aea 100644
--- a/jaas/boot/pom.xml
+++ b/jaas/boot/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/jaas/command/pom.xml
----------------------------------------------------------------------
diff --git a/jaas/command/pom.xml b/jaas/command/pom.xml
index 7815bc1..c9d022e 100644
--- a/jaas/command/pom.xml
+++ b/jaas/command/pom.xml
@@ -136,7 +136,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/bundles/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/bundles/pom.xml b/management/mbeans/bundles/pom.xml
index 31dcc01..580ccd0 100644
--- a/management/mbeans/bundles/pom.xml
+++ b/management/mbeans/bundles/pom.xml
@@ -105,8 +105,7 @@
*
</Import-Package>
<Private-Package>
- org.apache.karaf.management.mbeans.bundles.internal,
- !*
+ org.apache.karaf.management.mbeans.bundles.internal
</Private-Package>
</instructions>
</configuration>
@@ -114,4 +113,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/config/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/config/pom.xml b/management/mbeans/config/pom.xml
index 945940c..13ef644 100644
--- a/management/mbeans/config/pom.xml
+++ b/management/mbeans/config/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/dev/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/dev/pom.xml b/management/mbeans/dev/pom.xml
index d32ba8b..b20df1d 100644
--- a/management/mbeans/dev/pom.xml
+++ b/management/mbeans/dev/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/log/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/log/pom.xml b/management/mbeans/log/pom.xml
index f176775..18f2bc5 100644
--- a/management/mbeans/log/pom.xml
+++ b/management/mbeans/log/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/obr/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/obr/pom.xml b/management/mbeans/obr/pom.xml
index 826d07f..59e8d07 100644
--- a/management/mbeans/obr/pom.xml
+++ b/management/mbeans/obr/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/packages/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/packages/pom.xml b/management/mbeans/packages/pom.xml
index 175215c..6eed52e 100644
--- a/management/mbeans/packages/pom.xml
+++ b/management/mbeans/packages/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/services/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/services/pom.xml b/management/mbeans/services/pom.xml
index 3a6eaaf..33eb3c2 100644
--- a/management/mbeans/services/pom.xml
+++ b/management/mbeans/services/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/system/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/system/pom.xml b/management/mbeans/system/pom.xml
index 3643c87..0a5ca1e 100644
--- a/management/mbeans/system/pom.xml
+++ b/management/mbeans/system/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/management/mbeans/web/pom.xml
----------------------------------------------------------------------
diff --git a/management/mbeans/web/pom.xml b/management/mbeans/web/pom.xml
index 2f99c32..6c0a9c5 100644
--- a/management/mbeans/web/pom.xml
+++ b/management/mbeans/web/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/config/pom.xml
----------------------------------------------------------------------
diff --git a/shell/config/pom.xml b/shell/config/pom.xml
index 15be318..700b941 100644
--- a/shell/config/pom.xml
+++ b/shell/config/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/dev/pom.xml
----------------------------------------------------------------------
diff --git a/shell/dev/pom.xml b/shell/dev/pom.xml
index 5de926e..dbea379 100644
--- a/shell/dev/pom.xml
+++ b/shell/dev/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/log/pom.xml
----------------------------------------------------------------------
diff --git a/shell/log/pom.xml b/shell/log/pom.xml
index 0744bbe..7516c95 100644
--- a/shell/log/pom.xml
+++ b/shell/log/pom.xml
@@ -100,7 +100,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/obr/pom.xml
----------------------------------------------------------------------
diff --git a/shell/obr/pom.xml b/shell/obr/pom.xml
index 5e99bef..78761f9 100644
--- a/shell/obr/pom.xml
+++ b/shell/obr/pom.xml
@@ -101,7 +101,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/osgi/pom.xml
----------------------------------------------------------------------
diff --git a/shell/osgi/pom.xml b/shell/osgi/pom.xml
index bdc6c7d..9ae0091 100644
--- a/shell/osgi/pom.xml
+++ b/shell/osgi/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/packages/pom.xml
----------------------------------------------------------------------
diff --git a/shell/packages/pom.xml b/shell/packages/pom.xml
index 8d6d177..5e2b1a9 100644
--- a/shell/packages/pom.xml
+++ b/shell/packages/pom.xml
@@ -90,7 +90,6 @@
org.apache.karaf.shell.console,
*
</Import-Package>
- <Private-Package>!*</Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/shell/web/pom.xml
----------------------------------------------------------------------
diff --git a/shell/web/pom.xml b/shell/web/pom.xml
index 097aeb8..f26f472 100644
--- a/shell/web/pom.xml
+++ b/shell/web/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/karaf/blob/dc423454/webconsole/console/pom.xml
----------------------------------------------------------------------
diff --git a/webconsole/console/pom.xml b/webconsole/console/pom.xml
index 0a59b02..0853e97 100644
--- a/webconsole/console/pom.xml
+++ b/webconsole/console/pom.xml
@@ -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>