diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index e7d308c..83d720f 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/commons/activation/pom.xml b/commons/activation/pom.xml
index e90dbf0..372bc45 100644
--- a/commons/activation/pom.xml
+++ b/commons/activation/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/antlr/pom.xml b/commons/antlr/pom.xml
index f1fc10b..6b35e2f 100644
--- a/commons/antlr/pom.xml
+++ b/commons/antlr/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/aopalliance/pom.xml b/commons/aopalliance/pom.xml
index b13d193..4d9ccef 100644
--- a/commons/aopalliance/pom.xml
+++ b/commons/aopalliance/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/avalon-framework/pom.xml b/commons/avalon-framework/pom.xml
index 93a1117..bee1545 100644
--- a/commons/avalon-framework/pom.xml
+++ b/commons/avalon-framework/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/cglib/pom.xml b/commons/cglib/pom.xml
index 273d9a4..a4dc7f2 100644
--- a/commons/cglib/pom.xml
+++ b/commons/cglib/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-attributes-api/pom.xml b/commons/commons-attributes-api/pom.xml
index dbee688..4be6e97 100644
--- a/commons/commons-attributes-api/pom.xml
+++ b/commons/commons-attributes-api/pom.xml
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-attributes-compiler/pom.xml b/commons/commons-attributes-compiler/pom.xml
index 7370f4b..37fa4d8 100644
--- a/commons/commons-attributes-compiler/pom.xml
+++ b/commons/commons-attributes-compiler/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-beanutils/pom.xml b/commons/commons-beanutils/pom.xml
index 5a007a7..32a1871 100644
--- a/commons/commons-beanutils/pom.xml
+++ b/commons/commons-beanutils/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-codec/pom.xml b/commons/commons-codec/pom.xml
index cc094f4..796acf4 100644
--- a/commons/commons-codec/pom.xml
+++ b/commons/commons-codec/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-collections/pom.xml b/commons/commons-collections/pom.xml
index 50b3607..ecf6c56 100644
--- a/commons/commons-collections/pom.xml
+++ b/commons/commons-collections/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-configuration/pom.xml b/commons/commons-configuration/pom.xml
index 8f46aea..946a05c 100644
--- a/commons/commons-configuration/pom.xml
+++ b/commons/commons-configuration/pom.xml
@@ -108,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-digester/pom.xml b/commons/commons-digester/pom.xml
index a50e37b..a7d157b 100644
--- a/commons/commons-digester/pom.xml
+++ b/commons/commons-digester/pom.xml
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-el/pom.xml b/commons/commons-el/pom.xml
index 43f0a84..3fbe7ce 100644
--- a/commons/commons-el/pom.xml
+++ b/commons/commons-el/pom.xml
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-email/pom.xml b/commons/commons-email/pom.xml
index 84bfaf5..7ad530d 100644
--- a/commons/commons-email/pom.xml
+++ b/commons/commons-email/pom.xml
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-fileupload/pom.xml b/commons/commons-fileupload/pom.xml
index 2684b20..65259d5 100644
--- a/commons/commons-fileupload/pom.xml
+++ b/commons/commons-fileupload/pom.xml
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-httpclient/pom.xml b/commons/commons-httpclient/pom.xml
index fd0253d..c64ebce 100644
--- a/commons/commons-httpclient/pom.xml
+++ b/commons/commons-httpclient/pom.xml
@@ -76,7 +76,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-io/pom.xml b/commons/commons-io/pom.xml
index a61c9b2..8529ba5 100644
--- a/commons/commons-io/pom.xml
+++ b/commons/commons-io/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-jxpath/pom.xml b/commons/commons-jxpath/pom.xml
index f669925..a96fd77 100644
--- a/commons/commons-jxpath/pom.xml
+++ b/commons/commons-jxpath/pom.xml
@@ -119,7 +119,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-lang/pom.xml b/commons/commons-lang/pom.xml
index b4d182f..0db77bc 100644
--- a/commons/commons-lang/pom.xml
+++ b/commons/commons-lang/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-logging/pom.xml b/commons/commons-logging/pom.xml
index 9289bfe..f55c7b3 100644
--- a/commons/commons-logging/pom.xml
+++ b/commons/commons-logging/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/commons-validator/pom.xml b/commons/commons-validator/pom.xml
index b3b2b02..80990e1 100644
--- a/commons/commons-validator/pom.xml
+++ b/commons/commons-validator/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/commons/dom4j/pom.xml b/commons/dom4j/pom.xml
index bc6340e..3af83a9 100644
--- a/commons/dom4j/pom.xml
+++ b/commons/dom4j/pom.xml
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/ehcache/pom.xml b/commons/ehcache/pom.xml
index 67763f3..fbf03e6 100644
--- a/commons/ehcache/pom.xml
+++ b/commons/ehcache/pom.xml
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>                
                 <configuration>
                     <instructions>
diff --git a/commons/hibernate/pom.xml b/commons/hibernate/pom.xml
index 654291c..b425e6d 100644
--- a/commons/hibernate/pom.xml
+++ b/commons/hibernate/pom.xml
@@ -140,7 +140,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/hsqldb/pom.xml b/commons/hsqldb/pom.xml
index f7759aa..9b129fb 100644
--- a/commons/hsqldb/pom.xml
+++ b/commons/hsqldb/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jline/pom.xml b/commons/jline/pom.xml
index 8f70f8e..e9578a8 100644
--- a/commons/jline/pom.xml
+++ b/commons/jline/pom.xml
@@ -61,7 +61,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jms/pom.xml b/commons/jms/pom.xml
index 64a318d..81785c2 100644
--- a/commons/jms/pom.xml
+++ b/commons/jms/pom.xml
@@ -69,7 +69,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jmxtools/pom.xml b/commons/jmxtools/pom.xml
index 3b23472..aebd6e0 100644
--- a/commons/jmxtools/pom.xml
+++ b/commons/jmxtools/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jsp-api/pom.xml b/commons/jsp-api/pom.xml
index 69847b1..5f8a387 100644
--- a/commons/jsp-api/pom.xml
+++ b/commons/jsp-api/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jstl/pom.xml b/commons/jstl/pom.xml
index 91102ec..4d5850e 100644
--- a/commons/jstl/pom.xml
+++ b/commons/jstl/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jta/pom.xml b/commons/jta/pom.xml
index 168415f..82acc99 100644
--- a/commons/jta/pom.xml
+++ b/commons/jta/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/jzlib/pom.xml b/commons/jzlib/pom.xml
index e919b47..6c3d382 100644
--- a/commons/jzlib/pom.xml
+++ b/commons/jzlib/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/log4j/pom.xml b/commons/log4j/pom.xml
index 9dffde1..3c50418 100644
--- a/commons/log4j/pom.xml
+++ b/commons/log4j/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/logkit/pom.xml b/commons/logkit/pom.xml
index 52fecb4..4303a84 100644
--- a/commons/logkit/pom.xml
+++ b/commons/logkit/pom.xml
@@ -63,7 +63,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/mail/pom.xml b/commons/mail/pom.xml
index c63dad5..1dee51e 100644
--- a/commons/mail/pom.xml
+++ b/commons/mail/pom.xml
@@ -68,7 +68,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/poi-full/pom.xml b/commons/poi-full/pom.xml
index edfd827..67a407e 100644
--- a/commons/poi-full/pom.xml
+++ b/commons/poi-full/pom.xml
@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/poi/pom.xml b/commons/poi/pom.xml
index c751558..8a875ca 100644
--- a/commons/poi/pom.xml
+++ b/commons/poi/pom.xml
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/commons/portlet-api/pom.xml b/commons/portlet-api/pom.xml
index 81398d2..dcaa5cf 100644
--- a/commons/portlet-api/pom.xml
+++ b/commons/portlet-api/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/quartz/pom.xml b/commons/quartz/pom.xml
index 642e46b..3dac6c6 100644
--- a/commons/quartz/pom.xml
+++ b/commons/quartz/pom.xml
@@ -67,7 +67,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/servlet-api/pom.xml b/commons/servlet-api/pom.xml
index e5e83e3..0a9e6bd 100644
--- a/commons/servlet-api/pom.xml
+++ b/commons/servlet-api/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/xercesImpl/pom.xml b/commons/xercesImpl/pom.xml
index 53e8846..175b09a 100644
--- a/commons/xercesImpl/pom.xml
+++ b/commons/xercesImpl/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/xml-apis/pom.xml b/commons/xml-apis/pom.xml
index 60700bb..dcc3301 100644
--- a/commons/xml-apis/pom.xml
+++ b/commons/xml-apis/pom.xml
@@ -87,7 +87,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/commons/xml-resolver/pom.xml b/commons/xml-resolver/pom.xml
index cf7865e..4b917b7 100644
--- a/commons/xml-resolver/pom.xml
+++ b/commons/xml-resolver/pom.xml
@@ -62,7 +62,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 6d0f3b6..91a2f4c 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -53,7 +53,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
index 3e213d7..1eabc48 100644
--- a/dependencymanager/pom.xml
+++ b/dependencymanager/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
index d7b4e62..5f09a3a 100644
--- a/eventadmin/bridge.configuration/pom.xml
+++ b/eventadmin/bridge.configuration/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 7c6075f..67cc191 100644
--- a/eventadmin/bridge.upnp/pom.xml
+++ b/eventadmin/bridge.upnp/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 36327d7..1186c22 100644
--- a/eventadmin/bridge.useradmin/pom.xml
+++ b/eventadmin/bridge.useradmin/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index 343de94..f5e88b0 100644
--- a/eventadmin/bridge.wireadmin/pom.xml
+++ b/eventadmin/bridge.wireadmin/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index f558955..7bb8ea4 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/dictionaryclient/pom.xml b/examples/dictionaryclient/pom.xml
index c21e686..1a2c9c3 100644
--- a/examples/dictionaryclient/pom.xml
+++ b/examples/dictionaryclient/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/dictionaryclient2/pom.xml b/examples/dictionaryclient2/pom.xml
index ce794d9..311b975 100644
--- a/examples/dictionaryclient2/pom.xml
+++ b/examples/dictionaryclient2/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/dictionaryservice.itest/pom.xml b/examples/dictionaryservice.itest/pom.xml
index 48457b0..3dbe31a 100644
--- a/examples/dictionaryservice.itest/pom.xml
+++ b/examples/dictionaryservice.itest/pom.xml
@@ -77,7 +77,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/dictionaryservice/pom.xml b/examples/dictionaryservice/pom.xml
index 0e7d2f2..1134478 100644
--- a/examples/dictionaryservice/pom.xml
+++ b/examples/dictionaryservice/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/eventlistener/pom.xml b/examples/eventlistener/pom.xml
index 35abc16..28c5a5d 100644
--- a/examples/eventlistener/pom.xml
+++ b/examples/eventlistener/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/extenderbased.circle/pom.xml b/examples/extenderbased.circle/pom.xml
index b3d3c40..0184762 100644
--- a/examples/extenderbased.circle/pom.xml
+++ b/examples/extenderbased.circle/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/extenderbased.host/pom.xml b/examples/extenderbased.host/pom.xml
index 2fd811a..ef3e902 100644
--- a/examples/extenderbased.host/pom.xml
+++ b/examples/extenderbased.host/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/extenderbased.square/pom.xml b/examples/extenderbased.square/pom.xml
index 83f64cf..8eb2f1b 100644
--- a/examples/extenderbased.square/pom.xml
+++ b/examples/extenderbased.square/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/extenderbased.triangle/pom.xml b/examples/extenderbased.triangle/pom.xml
index 3d5c5c5..3e8abb2 100644
--- a/examples/extenderbased.triangle/pom.xml
+++ b/examples/extenderbased.triangle/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/frenchdictionary/pom.xml b/examples/frenchdictionary/pom.xml
index 5c873cb..c695c1c 100644
--- a/examples/frenchdictionary/pom.xml
+++ b/examples/frenchdictionary/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/servicebased.circle/pom.xml b/examples/servicebased.circle/pom.xml
index 59c79b9..d2d6b3c 100644
--- a/examples/servicebased.circle/pom.xml
+++ b/examples/servicebased.circle/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/servicebased.host/pom.xml b/examples/servicebased.host/pom.xml
index 01a9255..59936d3 100644
--- a/examples/servicebased.host/pom.xml
+++ b/examples/servicebased.host/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/servicebased.square/pom.xml b/examples/servicebased.square/pom.xml
index f1d9bee..ad5e6b2 100644
--- a/examples/servicebased.square/pom.xml
+++ b/examples/servicebased.square/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/servicebased.triangle/pom.xml b/examples/servicebased.triangle/pom.xml
index 1f7c909..0cb7df3 100644
--- a/examples/servicebased.triangle/pom.xml
+++ b/examples/servicebased.triangle/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/spellcheckbinder/pom.xml b/examples/spellcheckbinder/pom.xml
index 94daf8c..b568528 100644
--- a/examples/spellcheckbinder/pom.xml
+++ b/examples/spellcheckbinder/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/spellcheckclient/pom.xml b/examples/spellcheckclient/pom.xml
index 36e0c8e..1640010 100644
--- a/examples/spellcheckclient/pom.xml
+++ b/examples/spellcheckclient/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index 929e68c..37ec185 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -61,7 +61,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/examples/spellcheckservice/pom.xml b/examples/spellcheckservice/pom.xml
index 6b6bfcd..17e58e2 100644
--- a/examples/spellcheckservice/pom.xml
+++ b/examples/spellcheckservice/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/framework/pom.xml b/framework/pom.xml
index 5cd4042..d391922 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index 0cd6000..259cdb0 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index 0578491..9a62990 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -42,7 +42,7 @@
   	<plugin>
     	<groupId>org.apache.felix</groupId>
     	<artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
     	<extensions>true</extensions>
     	<configuration>
         	<instructions>          
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index 577a832..5ee1876 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -57,7 +57,7 @@
   	<plugin>
     	<groupId>org.apache.felix</groupId>
     	<artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
     	<extensions>true</extensions>
     	<configuration>
         	<instructions>          
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index f6506e3..f2505e9 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -50,7 +50,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index fb21902..813548b 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -55,7 +55,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>          
diff --git a/ipojo/event.admin.handler/pom.xml b/ipojo/event.admin.handler/pom.xml
index 9385205..fb69c57 100644
--- a/ipojo/event.admin.handler/pom.xml
+++ b/ipojo/event.admin.handler/pom.xml
@@ -54,7 +54,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/ipojo/jmx.handler/pom.xml b/ipojo/jmx.handler/pom.xml
index 9d209ae..fb5750c 100644
--- a/ipojo/jmx.handler/pom.xml
+++ b/ipojo/jmx.handler/pom.xml
@@ -52,7 +52,7 @@
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
 				<extensions>true</extensions>
 				<configuration>
 					<instructions>
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index 48d8abc..45e50dd 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>          
diff --git a/ipojo/metadata/pom.xml b/ipojo/metadata/pom.xml
index a946732..16d2048 100644
--- a/ipojo/metadata/pom.xml
+++ b/ipojo/metadata/pom.xml
@@ -33,7 +33,7 @@
   	<plugin>
     	<groupId>org.apache.felix</groupId>
     	<artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
     	<extensions>true</extensions>
     	<configuration>
         	<instructions>          
diff --git a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
index c37d010..c08f190 100644
--- a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
+++ b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
@@ -27,7 +27,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index a61af00..0c38e9a 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/jmood/pom.xml b/jmood/pom.xml
index 4115ca9..2a7b001 100644
--- a/jmood/pom.xml
+++ b/jmood/pom.xml
@@ -80,7 +80,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/jmxintrospector/pom.xml b/jmxintrospector/pom.xml
index c38c3cd..955a6d7 100644
--- a/jmxintrospector/pom.xml
+++ b/jmxintrospector/pom.xml
@@ -46,7 +46,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/log/pom.xml b/log/pom.xml
index 30fd3fa..0d35ca6 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/main/pom.xml b/main/pom.xml
index 1f3ffa0..0e264b05 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -94,7 +94,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/metatype/pom.xml b/metatype/pom.xml
index d4204cd..2489159 100644
--- a/metatype/pom.xml
+++ b/metatype/pom.xml
@@ -57,7 +57,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/mosgi/console.component/pom.xml b/mosgi/console.component/pom.xml
index bfce50e..e893392 100644
--- a/mosgi/console.component/pom.xml
+++ b/mosgi/console.component/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/console.gui/pom.xml b/mosgi/console.gui/pom.xml
index c8a329d..4c32540 100644
--- a/mosgi/console.gui/pom.xml
+++ b/mosgi/console.gui/pom.xml
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/console.ifc/pom.xml b/mosgi/console.ifc/pom.xml
index 5ff7293..b1a65c0 100644
--- a/mosgi/console.ifc/pom.xml
+++ b/mosgi/console.ifc/pom.xml
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/jmx.agent/pom.xml b/mosgi/jmx.agent/pom.xml
index acaad6d..a429f02 100644
--- a/mosgi/jmx.agent/pom.xml
+++ b/mosgi/jmx.agent/pom.xml
@@ -65,7 +65,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/jmx.httpconnector/pom.xml b/mosgi/jmx.httpconnector/pom.xml
index 5d21310..19aa099 100644
--- a/mosgi/jmx.httpconnector/pom.xml
+++ b/mosgi/jmx.httpconnector/pom.xml
@@ -70,7 +70,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/jmx.registry/pom.xml b/mosgi/jmx.registry/pom.xml
index 17e2296..45719e2 100644
--- a/mosgi/jmx.registry/pom.xml
+++ b/mosgi/jmx.registry/pom.xml
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/jmx.remotelogger/pom.xml b/mosgi/jmx.remotelogger/pom.xml
index 9882fbb..6f1399b 100644
--- a/mosgi/jmx.remotelogger/pom.xml
+++ b/mosgi/jmx.remotelogger/pom.xml
@@ -58,7 +58,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/jmx.rmiconnector/pom.xml b/mosgi/jmx.rmiconnector/pom.xml
index 07d9a02..67a4c5c 100644
--- a/mosgi/jmx.rmiconnector/pom.xml
+++ b/mosgi/jmx.rmiconnector/pom.xml
@@ -83,7 +83,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.bundlesprobes.tab/pom.xml b/mosgi/managedelements.bundlesprobes.tab/pom.xml
index f24edee..0d3cc9a 100644
--- a/mosgi/managedelements.bundlesprobes.tab/pom.xml
+++ b/mosgi/managedelements.bundlesprobes.tab/pom.xml
@@ -71,7 +71,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.bundlesprobes/pom.xml b/mosgi/managedelements.bundlesprobes/pom.xml
index 11f9cc6..fe48fa3 100644
--- a/mosgi/managedelements.bundlesprobes/pom.xml
+++ b/mosgi/managedelements.bundlesprobes/pom.xml
@@ -70,7 +70,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.memoryprobe/pom.xml b/mosgi/managedelements.memoryprobe/pom.xml
index 9e31042..09b5a03 100644
--- a/mosgi/managedelements.memoryprobe/pom.xml
+++ b/mosgi/managedelements.memoryprobe/pom.xml
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.obrprobe.tab/pom.xml b/mosgi/managedelements.obrprobe.tab/pom.xml
index 2e63464..543aa58 100644
--- a/mosgi/managedelements.obrprobe.tab/pom.xml
+++ b/mosgi/managedelements.obrprobe.tab/pom.xml
@@ -70,7 +70,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.obrprobe/pom.xml b/mosgi/managedelements.obrprobe/pom.xml
index 44e800f..20e7ef0 100644
--- a/mosgi/managedelements.obrprobe/pom.xml
+++ b/mosgi/managedelements.obrprobe/pom.xml
@@ -77,7 +77,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.osgiprobes.tab/pom.xml b/mosgi/managedelements.osgiprobes.tab/pom.xml
index 5274e8c..2a42f70 100644
--- a/mosgi/managedelements.osgiprobes.tab/pom.xml
+++ b/mosgi/managedelements.osgiprobes.tab/pom.xml
@@ -64,7 +64,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/mosgi/managedelements.osgiprobes/pom.xml b/mosgi/managedelements.osgiprobes/pom.xml
index 4bc64e8..651a8ae 100644
--- a/mosgi/managedelements.osgiprobes/pom.xml
+++ b/mosgi/managedelements.osgiprobes/pom.xml
@@ -70,7 +70,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index dca6f44..b44d4f3 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -54,7 +54,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index 058bce4..25c1c30 100644
--- a/org.osgi.core/pom.xml
+++ b/org.osgi.core/pom.xml
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/org.osgi.service.obr/pom.xml b/org.osgi.service.obr/pom.xml
index b67a9db..a615003 100644
--- a/org.osgi.service.obr/pom.xml
+++ b/org.osgi.service.obr/pom.xml
@@ -45,13 +45,12 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Export-Package>${pom.artifactId}</Export-Package>
-            <Import-Package>org.osgi.framework;version="[1.3,2)",*</Import-Package>
             <Bundle-Version>1</Bundle-Version>
             <Bundle-Copyright>Copyright (c) OSGi Alliance (2000, 2008). All Rights Reserved.</Bundle-Copyright>
             <Bundle-Category>osgi</Bundle-Category>
diff --git a/prefs/pom.xml b/prefs/pom.xml
index 6b88435..8ca0d47 100644
--- a/prefs/pom.xml
+++ b/prefs/pom.xml
@@ -59,7 +59,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/scr/pom.xml b/scr/pom.xml
index d200693..fbd77a1 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.2.1</version>
+                <version>1.4.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
diff --git a/servicebinder/pom.xml b/servicebinder/pom.xml
index e11ede0..2ce5850 100644
--- a/servicebinder/pom.xml
+++ b/servicebinder/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/shell.gui.plugin/pom.xml b/shell.gui.plugin/pom.xml
index 2bd6238..8ddaa46 100644
--- a/shell.gui.plugin/pom.xml
+++ b/shell.gui.plugin/pom.xml
@@ -59,7 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/shell.gui/pom.xml b/shell.gui/pom.xml
index 8bce207..4abd3d2 100644
--- a/shell.gui/pom.xml
+++ b/shell.gui/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index 52a538a..a2bbf7a 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/shell/pom.xml b/shell/pom.xml
index 588db57..a2f8a56 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index e2cc240..b833689 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -59,10 +59,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-<!--
-        <version>1.3.0-SNAPSHOT</version>
--->
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -99,7 +96,6 @@
           </instructions>
 	  <excludeDependencies>upnp-stack-jdk13</excludeDependencies>
         </configuration>
-<!--
 	<executions>
 	  <execution>
 	    <id>jdk13</id>
@@ -127,7 +123,6 @@
 	    </configuration>
 	  </execution>
 	</executions>
--->
       </plugin>      
     </plugins>
   </build>
@@ -151,13 +146,11 @@
       <version>1.8.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
-<!--
     <dependency>
       <groupId>it.cnr.isti.domoware.cyberdomo</groupId>
       <artifactId>upnp-stack-jdk13</artifactId>
       <version>1.8.0-SNAPSHOT</version>
       <optional>true</optional>
     </dependency>
--->
   </dependencies>
 </project>
diff --git a/upnp/extra/pom.xml b/upnp/extra/pom.xml
index d4a168b..53a4ae3 100644
--- a/upnp/extra/pom.xml
+++ b/upnp/extra/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/upnp/samples/binarylight/pom.xml b/upnp/samples/binarylight/pom.xml
index 8264178..df2e762 100644
--- a/upnp/samples/binarylight/pom.xml
+++ b/upnp/samples/binarylight/pom.xml
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/upnp/samples/clock/pom.xml b/upnp/samples/clock/pom.xml
index 61b4e9d..0f3e25b 100644
--- a/upnp/samples/clock/pom.xml
+++ b/upnp/samples/clock/pom.xml
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/upnp/samples/tv/pom.xml b/upnp/samples/tv/pom.xml
index 41c8f15..81ba75d 100644
--- a/upnp/samples/tv/pom.xml
+++ b/upnp/samples/tv/pom.xml
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/upnp/tester/pom.xml b/upnp/tester/pom.xml
index 0316870..aff1545 100644
--- a/upnp/tester/pom.xml
+++ b/upnp/tester/pom.xml
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
diff --git a/wireadmin/pom.xml b/wireadmin/pom.xml
index 9de2b3e..a653f34 100644
--- a/wireadmin/pom.xml
+++ b/wireadmin/pom.xml
@@ -47,7 +47,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.4.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>