Continued to svn repo refactoring, specifically moved and renamed the
maven-bundle-plugin to bundleplugin; this required that I updated all
POM files that use the plugin to use the new name.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@539960 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tools/maven2/maven-bundle-plugin/pom.xml b/bundleplugin/pom.xml
similarity index 97%
rename from tools/maven2/maven-bundle-plugin/pom.xml
rename to bundleplugin/pom.xml
index 0f46bf7..0923a5a 100644
--- a/tools/maven2/maven-bundle-plugin/pom.xml
+++ b/bundleplugin/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Bundle Plugin</name>
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPlugin.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundleInfo.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/BundlePlugin.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/ManifestPlugin.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/PackageVersionAnalyzer.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java b/bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
rename to bundleplugin/src/main/java/org/apache/felix/tools/maven2/bundleplugin/WrapPlugin.java
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/LICENSE b/bundleplugin/src/main/resources/META-INF/LICENSE
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/LICENSE
rename to bundleplugin/src/main/resources/META-INF/LICENSE
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/NOTICE b/bundleplugin/src/main/resources/META-INF/NOTICE
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/NOTICE
rename to bundleplugin/src/main/resources/META-INF/NOTICE
diff --git a/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml b/bundleplugin/src/main/resources/META-INF/plexus/components.xml
similarity index 96%
rename from tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml
rename to bundleplugin/src/main/resources/META-INF/plexus/components.xml
index 1eb9b8e..7481e7e 100644
--- a/tools/maven2/maven-bundle-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/bundleplugin/src/main/resources/META-INF/plexus/components.xml
@@ -33,7 +33,7 @@
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
- <package>org.apache.felix:maven-bundle-plugin:bundle</package>
+ <package>org.apache.felix:org.apache.felix.bundleplugin:bundle</package>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
diff --git a/tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java b/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/AbstractBundlePluginTest.java
diff --git a/tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java b/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundleAllPluginTest.java
diff --git a/tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java b/bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
rename to bundleplugin/src/test/java/org/apache/felix/tools/maven2/bundleplugin/BundlePluginTest.java
diff --git a/tools/maven2/maven-bundle-plugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar b/bundleplugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar
similarity index 100%
rename from tools/maven2/maven-bundle-plugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar
rename to bundleplugin/src/test/resources/org.apache.maven.maven-model_2.1.0.SNAPSHOT.jar
Binary files differ
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 0fa52b7..f4c4efb 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -48,7 +48,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/activation/pom.xml b/commons/activation/pom.xml
index b93ac83..d4beda1 100644
--- a/commons/activation/pom.xml
+++ b/commons/activation/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/antlr/pom.xml b/commons/antlr/pom.xml
index f4b0ab0..e683878 100644
--- a/commons/antlr/pom.xml
+++ b/commons/antlr/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/aopalliance/pom.xml b/commons/aopalliance/pom.xml
index 3c863ba..b55a083 100644
--- a/commons/aopalliance/pom.xml
+++ b/commons/aopalliance/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/avalon-framework/pom.xml b/commons/avalon-framework/pom.xml
index 0a49764..8bb96ad 100644
--- a/commons/avalon-framework/pom.xml
+++ b/commons/avalon-framework/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/cglib/pom.xml b/commons/cglib/pom.xml
index 1c9fef6..c65469e 100644
--- a/commons/cglib/pom.xml
+++ b/commons/cglib/pom.xml
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-attributes-api/pom.xml b/commons/commons-attributes-api/pom.xml
index d0f17ab..4855f69 100644
--- a/commons/commons-attributes-api/pom.xml
+++ b/commons/commons-attributes-api/pom.xml
@@ -65,7 +65,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-attributes-compiler/pom.xml b/commons/commons-attributes-compiler/pom.xml
index 6ff9133..b370b64 100644
--- a/commons/commons-attributes-compiler/pom.xml
+++ b/commons/commons-attributes-compiler/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-beanutils/pom.xml b/commons/commons-beanutils/pom.xml
index f71ac82..c600abb 100644
--- a/commons/commons-beanutils/pom.xml
+++ b/commons/commons-beanutils/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-codec/pom.xml b/commons/commons-codec/pom.xml
index 0a22990..f7d60dd 100644
--- a/commons/commons-codec/pom.xml
+++ b/commons/commons-codec/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-collections/pom.xml b/commons/commons-collections/pom.xml
index 15fa38d..9f9d078 100644
--- a/commons/commons-collections/pom.xml
+++ b/commons/commons-collections/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-configuration/pom.xml b/commons/commons-configuration/pom.xml
index 3ce2fd0..b563200 100644
--- a/commons/commons-configuration/pom.xml
+++ b/commons/commons-configuration/pom.xml
@@ -102,7 +102,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-digester/pom.xml b/commons/commons-digester/pom.xml
index 80b49ce..9ed7bbc 100644
--- a/commons/commons-digester/pom.xml
+++ b/commons/commons-digester/pom.xml
@@ -74,7 +74,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-el/pom.xml b/commons/commons-el/pom.xml
index 131e7c4..8704bca 100644
--- a/commons/commons-el/pom.xml
+++ b/commons/commons-el/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-email/pom.xml b/commons/commons-email/pom.xml
index b009c4a..6f83e61 100644
--- a/commons/commons-email/pom.xml
+++ b/commons/commons-email/pom.xml
@@ -73,7 +73,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
diff --git a/commons/commons-fileupload/pom.xml b/commons/commons-fileupload/pom.xml
index 87e461a..d81d91f 100644
--- a/commons/commons-fileupload/pom.xml
+++ b/commons/commons-fileupload/pom.xml
@@ -62,7 +62,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-httpclient/pom.xml b/commons/commons-httpclient/pom.xml
index 4cb6fa3..7d09e0f 100644
--- a/commons/commons-httpclient/pom.xml
+++ b/commons/commons-httpclient/pom.xml
@@ -69,7 +69,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-io/pom.xml b/commons/commons-io/pom.xml
index d478188..b9c9a93 100644
--- a/commons/commons-io/pom.xml
+++ b/commons/commons-io/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-jxpath/pom.xml b/commons/commons-jxpath/pom.xml
index b823637..2fef3d4 100644
--- a/commons/commons-jxpath/pom.xml
+++ b/commons/commons-jxpath/pom.xml
@@ -112,7 +112,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-lang/pom.xml b/commons/commons-lang/pom.xml
index 2bc3953..a6d6ee8 100644
--- a/commons/commons-lang/pom.xml
+++ b/commons/commons-lang/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/commons-logging/pom.xml b/commons/commons-logging/pom.xml
index d79a646..a711476 100644
--- a/commons/commons-logging/pom.xml
+++ b/commons/commons-logging/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/dom4j/pom.xml b/commons/dom4j/pom.xml
index b9c5c66..8ca8d1a 100644
--- a/commons/dom4j/pom.xml
+++ b/commons/dom4j/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/ehcache/pom.xml b/commons/ehcache/pom.xml
index 1501ded..cbc0cac 100644
--- a/commons/ehcache/pom.xml
+++ b/commons/ehcache/pom.xml
@@ -61,7 +61,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/hibernate/pom.xml b/commons/hibernate/pom.xml
index 74cb31e..5781757 100644
--- a/commons/hibernate/pom.xml
+++ b/commons/hibernate/pom.xml
@@ -133,7 +133,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/hsqldb/pom.xml b/commons/hsqldb/pom.xml
index 442e422..3131957 100644
--- a/commons/hsqldb/pom.xml
+++ b/commons/hsqldb/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/jms/pom.xml b/commons/jms/pom.xml
index f8f1739..c0554a0 100644
--- a/commons/jms/pom.xml
+++ b/commons/jms/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/jmxtools/pom.xml b/commons/jmxtools/pom.xml
index 6c14579..cfb14d7 100644
--- a/commons/jmxtools/pom.xml
+++ b/commons/jmxtools/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/jstl/pom.xml b/commons/jstl/pom.xml
index 2a6b210..e848b80 100644
--- a/commons/jstl/pom.xml
+++ b/commons/jstl/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/jta/pom.xml b/commons/jta/pom.xml
index 519e496..7108552 100644
--- a/commons/jta/pom.xml
+++ b/commons/jta/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/jzlib/pom.xml b/commons/jzlib/pom.xml
index 44cf8b8..20c2f99 100644
--- a/commons/jzlib/pom.xml
+++ b/commons/jzlib/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/log4j/pom.xml b/commons/log4j/pom.xml
index 22aaa88..46b933f 100644
--- a/commons/log4j/pom.xml
+++ b/commons/log4j/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/logkit/pom.xml b/commons/logkit/pom.xml
index cc1ecaf..eccbdb8 100644
--- a/commons/logkit/pom.xml
+++ b/commons/logkit/pom.xml
@@ -56,7 +56,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/mail/pom.xml b/commons/mail/pom.xml
index 86992f0..7c98f69 100644
--- a/commons/mail/pom.xml
+++ b/commons/mail/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/servlet-api/pom.xml b/commons/servlet-api/pom.xml
index f7d7c14..a4c2bea 100644
--- a/commons/servlet-api/pom.xml
+++ b/commons/servlet-api/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/xercesImpl/pom.xml b/commons/xercesImpl/pom.xml
index 31eb969..35bb57d 100644
--- a/commons/xercesImpl/pom.xml
+++ b/commons/xercesImpl/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/commons/xml-resolver/pom.xml b/commons/xml-resolver/pom.xml
index 9af59a8..5d44eb1 100644
--- a/commons/xml-resolver/pom.xml
+++ b/commons/xml-resolver/pom.xml
@@ -55,7 +55,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 5fe2437..56c6410 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -30,7 +30,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
diff --git a/eventadmin/bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
index 158f4ee..d720040 100644
--- a/eventadmin/bridge.configuration/pom.xml
+++ b/eventadmin/bridge.configuration/pom.xml
@@ -27,7 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 11868ae..08010e0 100644
--- a/eventadmin/bridge.upnp/pom.xml
+++ b/eventadmin/bridge.upnp/pom.xml
@@ -27,7 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 7133626..7afdb01 100644
--- a/eventadmin/bridge.useradmin/pom.xml
+++ b/eventadmin/bridge.useradmin/pom.xml
@@ -27,7 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index d421713..517e917 100644
--- a/eventadmin/bridge.wireadmin/pom.xml
+++ b/eventadmin/bridge.wireadmin/pom.xml
@@ -27,7 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index 3271e56..b40fe1c 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -27,7 +27,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index b2f46cf..dcc0599 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -58,7 +58,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/framework/pom.xml b/framework/pom.xml
index 5c7da03..9452fd8 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index e720c3f..8083975 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/ipojo/pom.xml b/ipojo/pom.xml
index d562295..be42bb2 100644
--- a/ipojo/pom.xml
+++ b/ipojo/pom.xml
@@ -37,7 +37,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index 4fce36f..eabdc25 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -13,7 +13,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/log/pom.xml b/log/pom.xml
index 0785d50..baff150 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -25,7 +25,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/main/pom.xml b/main/pom.xml
index d5bbd25..e8aa809 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -79,7 +79,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/metatype/pom.xml b/metatype/pom.xml
index c0e2eb1..0c8c019 100644
--- a/metatype/pom.xml
+++ b/metatype/pom.xml
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
diff --git a/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index 5a94239..7261618 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -51,7 +51,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index 08ecffd..9ac3bd3 100644
--- a/org.osgi.core/pom.xml
+++ b/org.osgi.core/pom.xml
@@ -35,7 +35,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/pom.xml b/pom.xml
index a0833f2..1f6e659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
Felix contains 3 custom maven packaging plugins. Each creates a jar file
as an artifact.
- maven-bundle-plugin
+ org.apache.felix.bundleplugin
(bundle packaging - latest prefered plugin for generating OSGi bundles.)
maven-osgi-plugin
(osgi-bundle packaging - old plugin for generating OSGi bundles.)
@@ -95,7 +95,7 @@
</property>
</activation>
<modules>
- <module>tools/maven2/maven-bundle-plugin</module>
+ <module>bundleplugin</module>
<module>tools/maven2/maven-osgi-plugin</module>
<module>ipojo.plugin</module>
</modules>
diff --git a/scr/pom.xml b/scr/pom.xml
index fb18b67..e030384 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -32,7 +32,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<version>0.9.0-incubator-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index d53fc6e..22b7e47 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -43,7 +43,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/shell/pom.xml b/shell/pom.xml
index 1d962ce..27045d3 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -38,7 +38,7 @@
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
+ <artifactId>org.apache.felix.bundleplugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>