diff --git a/activation-api-1.1/pom.xml b/activation-api-1.1/pom.xml
index d12c5cb..aceec0b 100644
--- a/activation-api-1.1/pom.xml
+++ b/activation-api-1.1/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -67,7 +67,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.activation*;version=1.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>
                             *,
diff --git a/jain-sip-api-1.2/pom.xml b/jain-sip-api-1.2/pom.xml
index 7e37a70..30458f3 100644
--- a/jain-sip-api-1.2/pom.xml
+++ b/jain-sip-api-1.2/pom.xml
@@ -58,7 +58,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.sip*;version=1.2;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/java-persistence-api-1.1.1/pom.xml b/java-persistence-api-1.1.1/pom.xml
index ffd54e0..85abb89 100644
--- a/java-persistence-api-1.1.1/pom.xml
+++ b/java-persistence-api-1.1.1/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=1.1.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/java-persistence-api-2.0/pom.xml b/java-persistence-api-2.0/pom.xml
index cb122cc..bd78ea3 100644
--- a/java-persistence-api-2.0/pom.xml
+++ b/java-persistence-api-2.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.persistence*;version=2.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/javamail-api-1.4/pom.xml b/javamail-api-1.4/pom.xml
index 6c29f41..eb279bc 100644
--- a/javamail-api-1.4/pom.xml
+++ b/javamail-api-1.4/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.mail*;version=1.4;-split-package:=merge-first,org.apache.geronimo.mail*;version=1.6;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jaxb-api-2.0/pom.xml b/jaxb-api-2.0/pom.xml
index ac2e56c..c03eee3 100644
--- a/jaxb-api-2.0/pom.xml
+++ b/jaxb-api-2.0/pom.xml
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -79,7 +79,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.bind*;version=2.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jaxb-api-2.1/pom.xml b/jaxb-api-2.1/pom.xml
index bb33a99..b7126d6 100644
--- a/jaxb-api-2.1/pom.xml
+++ b/jaxb-api-2.1/pom.xml
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -79,7 +79,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.bind*;version=2.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jaxp-api-1.3/pom.xml b/jaxp-api-1.3/pom.xml
index 27c7ae4..ad2a968 100644
--- a/jaxp-api-1.3/pom.xml
+++ b/jaxp-api-1.3/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
@@ -61,7 +61,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>
                             javax.xml*;version=1.3;-split-package:=merge-first,
                             org.w3c.dom*;version=1.0;-split-package:=merge-first,
diff --git a/jaxp-api-1.4/pom.xml b/jaxp-api-1.4/pom.xml
index afa2fdf..bd57fb9 100644
--- a/jaxp-api-1.4/pom.xml
+++ b/jaxp-api-1.4/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
@@ -61,7 +61,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>
                             javax.xml.stream*;version=1.0.1;-split-package:=merge-first,
                             javax.xml*;version=1.4;-split-package:=merge-first,
diff --git a/jaxws-api-2.0/pom.xml b/jaxws-api-2.0/pom.xml
index 7d8f965..1fea562 100644
--- a/jaxws-api-2.0/pom.xml
+++ b/jaxws-api-2.0/pom.xml
@@ -96,17 +96,17 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
@@ -127,7 +127,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.ws*;version=2.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jaxws-api-2.1/pom.xml b/jaxws-api-2.1/pom.xml
index 8491ffc..f514a97 100644
--- a/jaxws-api-2.1/pom.xml
+++ b/jaxws-api-2.1/pom.xml
@@ -60,22 +60,22 @@
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.specs</groupId>
             <artifactId>org.apache.servicemix.specs.locator</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
     <build>
@@ -85,7 +85,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.ws*;version=2.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jbi-api-1.0/pom.xml b/jbi-api-1.0/pom.xml
index 01c0f40..6133281 100644
--- a/jbi-api-1.0/pom.xml
+++ b/jbi-api-1.0/pom.xml
@@ -48,7 +48,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.jbi*;version=1.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Implementation-Title>Apache ServiceMix</Implementation-Title>
diff --git a/jsr250-1.0/pom.xml b/jsr250-1.0/pom.xml
index 382c255..a45858f 100644
--- a/jsr250-1.0/pom.xml
+++ b/jsr250-1.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.annotation*;version=1.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jsr303-api-1.0.0/pom.xml b/jsr303-api-1.0.0/pom.xml
index 6bb3e33..7bdba9b 100644
--- a/jsr303-api-1.0.0/pom.xml
+++ b/jsr303-api-1.0.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.validation*;version=1.0.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>
                             !javax.validation*,
diff --git a/jsr311-api-0.8/pom.xml b/jsr311-api-0.8/pom.xml
index f84e894..9b7e886 100644
--- a/jsr311-api-0.8/pom.xml
+++ b/jsr311-api-0.8/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.ws.rs*;version=0.8;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jsr311-api-1.0/pom.xml b/jsr311-api-1.0/pom.xml
index aaf9ec8..c43e89a 100644
--- a/jsr311-api-1.0/pom.xml
+++ b/jsr311-api-1.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.ws.rs*;version=1.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/jsr311-api-1.1/pom.xml b/jsr311-api-1.1/pom.xml
index cd3ebfe..cfee4cc 100644
--- a/jsr311-api-1.1/pom.xml
+++ b/jsr311-api-1.1/pom.xml
@@ -68,7 +68,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.ws.rs*;version=1.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/pom.xml b/pom.xml
index 11d6d44..7923c9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <groupId>org.apache.servicemix</groupId>
         <artifactId>servicemix-pom</artifactId>
         <relativePath>../servicemix-pom/pom.xml</relativePath>
-        <version>3</version>
+        <version>5</version>
     </parent>
 
     <groupId>org.apache.servicemix.specs</groupId>
@@ -140,7 +140,7 @@
                 <plugin>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>maven-bundle-plugin</artifactId>
-                    <version>1.4.1</version>
+                    <version>2.1.0</version>
                     <extensions>true</extensions>
                 </plugin>
                 <plugin>
diff --git a/saaj-api-1.3/pom.xml b/saaj-api-1.3/pom.xml
index 2cef3e3..56401bc 100644
--- a/saaj-api-1.3/pom.xml
+++ b/saaj-api-1.3/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.soap*;version=1.3;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/scripting-api-1.0/pom.xml b/scripting-api-1.0/pom.xml
index 6dd9109..95d917b 100644
--- a/scripting-api-1.0/pom.xml
+++ b/scripting-api-1.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.script*;version=1.0;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>
diff --git a/stax-api-1.0/pom.xml b/stax-api-1.0/pom.xml
index eb9b7b7..c2c2baa 100644
--- a/stax-api-1.0/pom.xml
+++ b/stax-api-1.0/pom.xml
@@ -53,7 +53,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Export-Package>javax.xml.stream*;version=1.0.1;-split-package:=merge-first</Export-Package>
                         <Import-Package>*</Import-Package>
                         <Private-Package>org.apache.servicemix.specs.locator;-split-package:=merge-first</Private-Package>