Renamed the artifactId of the bundle plugin back to maven-bundle-plugin.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@540223 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/pom.xml b/bundleplugin/pom.xml
index 0923a5a..0f46bf7 100644
--- a/bundleplugin/pom.xml
+++ b/bundleplugin/pom.xml
@@ -28,7 +28,7 @@
 
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundleplugin</artifactId>
+ <artifactId>maven-bundle-plugin</artifactId>
 
  <packaging>maven-plugin</packaging>
  <name>Maven Bundle Plugin</name>
diff --git a/bundleplugin/src/main/resources/META-INF/plexus/components.xml b/bundleplugin/src/main/resources/META-INF/plexus/components.xml
index 7481e7e..1eb9b8e 100644
--- a/bundleplugin/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:org.apache.felix.bundleplugin:bundle</package>
+              <package>org.apache.felix:maven-bundle-plugin: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/bundlerepository/pom.xml b/bundlerepository/pom.xml
index f4c4efb..0fa52b7 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -48,7 +48,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/commons/activation/pom.xml b/commons/activation/pom.xml
index d4beda1..b93ac83 100644
--- a/commons/activation/pom.xml
+++ b/commons/activation/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/antlr/pom.xml b/commons/antlr/pom.xml
index e683878..f4b0ab0 100644
--- a/commons/antlr/pom.xml
+++ b/commons/antlr/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/aopalliance/pom.xml b/commons/aopalliance/pom.xml
index b55a083..3c863ba 100644
--- a/commons/aopalliance/pom.xml
+++ b/commons/aopalliance/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/avalon-framework/pom.xml b/commons/avalon-framework/pom.xml
index 8bb96ad..0a49764 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/cglib/pom.xml b/commons/cglib/pom.xml
index c65469e..1c9fef6 100644
--- a/commons/cglib/pom.xml
+++ b/commons/cglib/pom.xml
@@ -56,7 +56,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-attributes-api/pom.xml b/commons/commons-attributes-api/pom.xml
index 4855f69..d0f17ab 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-attributes-compiler/pom.xml b/commons/commons-attributes-compiler/pom.xml
index b370b64..6ff9133 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-beanutils/pom.xml b/commons/commons-beanutils/pom.xml
index c600abb..f71ac82 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-codec/pom.xml b/commons/commons-codec/pom.xml
index f7d60dd..0a22990 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-collections/pom.xml b/commons/commons-collections/pom.xml
index 9f9d078..15fa38d 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-configuration/pom.xml b/commons/commons-configuration/pom.xml
index b563200..3ce2fd0 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-digester/pom.xml b/commons/commons-digester/pom.xml
index 9ed7bbc..80b49ce 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-el/pom.xml b/commons/commons-el/pom.xml
index 8704bca..131e7c4 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-email/pom.xml b/commons/commons-email/pom.xml
index 6f83e61..b009c4a 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</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 d81d91f..87e461a 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-httpclient/pom.xml b/commons/commons-httpclient/pom.xml
index 7d09e0f..4cb6fa3 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-io/pom.xml b/commons/commons-io/pom.xml
index b9c9a93..d478188 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-jxpath/pom.xml b/commons/commons-jxpath/pom.xml
index 2fef3d4..b823637 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-lang/pom.xml b/commons/commons-lang/pom.xml
index a6d6ee8..2bc3953 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-logging/pom.xml b/commons/commons-logging/pom.xml
index a711476..d79a646 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/dom4j/pom.xml b/commons/dom4j/pom.xml
index 8ca8d1a..b9c5c66 100644
--- a/commons/dom4j/pom.xml
+++ b/commons/dom4j/pom.xml
@@ -61,7 +61,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/ehcache/pom.xml b/commons/ehcache/pom.xml
index cbc0cac..1501ded 100644
--- a/commons/ehcache/pom.xml
+++ b/commons/ehcache/pom.xml
@@ -61,7 +61,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/hibernate/pom.xml b/commons/hibernate/pom.xml
index 5781757..74cb31e 100644
--- a/commons/hibernate/pom.xml
+++ b/commons/hibernate/pom.xml
@@ -133,7 +133,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/hsqldb/pom.xml b/commons/hsqldb/pom.xml
index 3131957..442e422 100644
--- a/commons/hsqldb/pom.xml
+++ b/commons/hsqldb/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jms/pom.xml b/commons/jms/pom.xml
index c0554a0..f8f1739 100644
--- a/commons/jms/pom.xml
+++ b/commons/jms/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jmxtools/pom.xml b/commons/jmxtools/pom.xml
index cfb14d7..6c14579 100644
--- a/commons/jmxtools/pom.xml
+++ b/commons/jmxtools/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jstl/pom.xml b/commons/jstl/pom.xml
index e848b80..2a6b210 100644
--- a/commons/jstl/pom.xml
+++ b/commons/jstl/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jta/pom.xml b/commons/jta/pom.xml
index 7108552..519e496 100644
--- a/commons/jta/pom.xml
+++ b/commons/jta/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jzlib/pom.xml b/commons/jzlib/pom.xml
index 20c2f99..44cf8b8 100644
--- a/commons/jzlib/pom.xml
+++ b/commons/jzlib/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/log4j/pom.xml b/commons/log4j/pom.xml
index 46b933f..22aaa88 100644
--- a/commons/log4j/pom.xml
+++ b/commons/log4j/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/logkit/pom.xml b/commons/logkit/pom.xml
index eccbdb8..cc1ecaf 100644
--- a/commons/logkit/pom.xml
+++ b/commons/logkit/pom.xml
@@ -56,7 +56,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/mail/pom.xml b/commons/mail/pom.xml
index 7c98f69..86992f0 100644
--- a/commons/mail/pom.xml
+++ b/commons/mail/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/servlet-api/pom.xml b/commons/servlet-api/pom.xml
index a4c2bea..f7d7c14 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/xercesImpl/pom.xml b/commons/xercesImpl/pom.xml
index 35bb57d..31eb969 100644
--- a/commons/xercesImpl/pom.xml
+++ b/commons/xercesImpl/pom.xml
@@ -55,7 +55,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/xml-resolver/pom.xml b/commons/xml-resolver/pom.xml
index 5d44eb1..9af59a8 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>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 56c6410..5fe2437 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -30,7 +30,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</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 d720040..158f4ee 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 08010e0..11868ae 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 7afdb01..7133626 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index 517e917..d421713 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index b40fe1c..3271e56 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -27,7 +27,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index dcc0599..b2f46cf 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -58,7 +58,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/framework/pom.xml b/framework/pom.xml
index 9452fd8..5c7da03 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -37,7 +37,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index 8083975..e720c3f 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -37,7 +37,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index be42bb2..d562295 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -37,7 +37,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>          
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index eabdc25..4fce36f 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -13,7 +13,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/log/pom.xml b/log/pom.xml
index baff150..0785d50 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -25,7 +25,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/main/pom.xml b/main/pom.xml
index e8aa809..d5bbd25 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -79,7 +79,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/metatype/pom.xml b/metatype/pom.xml
index 0c8c019..c0e2eb1 100644
--- a/metatype/pom.xml
+++ b/metatype/pom.xml
@@ -35,7 +35,7 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
-                <artifactId>org.apache.felix.bundleplugin</artifactId>
+                <artifactId>maven-bundle-plugin</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 7261618..5a94239 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index 9ac3bd3..08ecffd 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>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/pom.xml b/pom.xml
index 2a7fa39..fc725d0 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. 
   
-  org.apache.felix.bundleplugin 
+  maven-bundle-plugin 
     (bundle packaging - latest prefered plugin for generating OSGi bundles.)
   maven-osgi-plugin 
     (osgi-bundle packaging - old plugin for generating OSGi bundles.)
diff --git a/scr/pom.xml b/scr/pom.xml
index e030384..fb18b67 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -32,7 +32,7 @@
         <plugins>

             <plugin>

                 <groupId>org.apache.felix</groupId>

-                <artifactId>org.apache.felix.bundleplugin</artifactId>

+                <artifactId>maven-bundle-plugin</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 22b7e47..d53fc6e 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -43,7 +43,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/shell/pom.xml b/shell/pom.xml
index 27045d3..1d962ce 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -38,7 +38,7 @@
     <plugins>
       <plugin>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.bundleplugin</artifactId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
           <instructions>