diff --git a/commons/activation/pom.xml b/commons/activation/pom.xml
index e5a8cf5..f69eb9f 100644
--- a/commons/activation/pom.xml
+++ b/commons/activation/pom.xml
@@ -30,7 +30,7 @@
     <properties>
         <pkgArtifactId>activation</pkgArtifactId>
         <pkgVersion>1.1</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
diff --git a/commons/commons-beanutils/pom.xml b/commons/commons-beanutils/pom.xml
index ce24e02..f416955 100644
--- a/commons/commons-beanutils/pom.xml
+++ b/commons/commons-beanutils/pom.xml
@@ -30,7 +30,7 @@
     <properties>
         <pkgArtifactId>commons-beanutils</pkgArtifactId>
         <pkgVersion>1.7.0</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
diff --git a/commons/commons-codec/pom.xml b/commons/commons-codec/pom.xml
index c59da1b..2a241e6 100644
--- a/commons/commons-codec/pom.xml
+++ b/commons/commons-codec/pom.xml
@@ -30,7 +30,7 @@
     <properties>
         <pkgArtifactId>commons-codec</pkgArtifactId>
         <pkgVersion>1.3</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
diff --git a/commons/commons-collections/pom.xml b/commons/commons-collections/pom.xml
index 9bc652a..12f22a5 100644
--- a/commons/commons-collections/pom.xml
+++ b/commons/commons-collections/pom.xml
@@ -30,7 +30,7 @@
     <properties>
         <pkgArtifactId>commons-collections</pkgArtifactId>
         <pkgVersion>3.2</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
diff --git a/commons/commons-io/pom.xml b/commons/commons-io/pom.xml
index caef1a2..85b8a42 100644
--- a/commons/commons-io/pom.xml
+++ b/commons/commons-io/pom.xml
@@ -30,7 +30,7 @@
     <properties>
         <pkgArtifactId>commons-io</pkgArtifactId>
         <pkgVersion>1.3.2</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
diff --git a/commons/commons-lang/pom.xml b/commons/commons-lang/pom.xml
index ac6a039..4c81267 100644
--- a/commons/commons-lang/pom.xml
+++ b/commons/commons-lang/pom.xml
@@ -1,4 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License. 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix.commons</groupId>
@@ -9,12 +30,12 @@
     <properties>
         <pkgArtifactId>commons-lang</pkgArtifactId>
         <pkgVersion>2.3</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
     <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>2.3.0-0002-SNAPSHOT</version>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>
diff --git a/commons/mail/pom.xml b/commons/mail/pom.xml
index c829b36..6acc9ac 100644
--- a/commons/mail/pom.xml
+++ b/commons/mail/pom.xml
@@ -1,4 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License. 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix.commons</groupId>
@@ -9,13 +30,13 @@
     <properties>
         <pkgArtifactId>mail</pkgArtifactId>
         <pkgVersion>1.4</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
         <activationVersion>1.1</activationVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
     <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>1.4.0-0002-SNAPSHOT</version>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>
diff --git a/commons/poi-full/pom.xml b/commons/poi-full/pom.xml
index b6ba269..31a69ed 100644
--- a/commons/poi-full/pom.xml
+++ b/commons/poi-full/pom.xml
@@ -29,13 +29,13 @@
     <properties>
         <pkgArtifactId>poi-full</pkgArtifactId>
         <pkgVersion>3.0.1-FINAL</pkgVersion>
-        <pomVersion>0001</pomVersion>
+        <pomVersion>0002</pomVersion>
         <osgiVersion>${pkgVersion}</osgiVersion>
     </properties>
 
     <groupId>org.apache.felix.commons</groupId>
     <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>3.0.1-FINAL-0002-SNAPSHOT</version>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>
diff --git a/commons/poi/pom.xml b/commons/poi/pom.xml
index b028983..88d4e12 100644
--- a/commons/poi/pom.xml
+++ b/commons/poi/pom.xml
@@ -28,12 +28,12 @@
   <properties>
     <pkgArtifactId>poi</pkgArtifactId>
     <pkgVersion>3.0.1-FINAL</pkgVersion>
-    <pomVersion>0001</pomVersion>
+    <pomVersion>0002</pomVersion>
     <osgiVersion>${pkgVersion}</osgiVersion>
   </properties>
   <groupId>org.apache.felix.commons</groupId>
   <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-  <version>3.0.1-FINAL-0002-SNAPSHOT</version>
+  <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${pkgArtifactId} bundle</name>
   <description>
diff --git a/commons/servlet-api/pom.xml b/commons/servlet-api/pom.xml
index fe0d255..47348c3 100644
--- a/commons/servlet-api/pom.xml
+++ b/commons/servlet-api/pom.xml
@@ -1,4 +1,25 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License. 
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix.commons</groupId>
@@ -8,13 +29,13 @@
     </parent>
     <properties>
         <pkgArtifactId>servlet-api</pkgArtifactId>
-        <pkgVersion>2.3</pkgVersion>
+        <pkgVersion>2.4</pkgVersion>
         <pomVersion>0001</pomVersion>
         <osgiVersion>${pkgVersion}.0</osgiVersion>
     </properties>
     <groupId>org.apache.felix.commons</groupId>
     <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-    <version>2.3.0-0002-SNAPSHOT</version>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${pkgArtifactId} bundle</name>
     <description>
diff --git a/commons/xml-apis/pom.xml b/commons/xml-apis/pom.xml
index d12a239..08ab3aa 100644
--- a/commons/xml-apis/pom.xml
+++ b/commons/xml-apis/pom.xml
@@ -32,13 +32,13 @@
     <pkgArtifactId>xml-apis</pkgArtifactId>
     <pkgVersion>1.3.4</pkgVersion>
     <realPkgVersion>1.3.04</realPkgVersion>
-    <pomVersion>0001</pomVersion>
+    <pomVersion>0002</pomVersion>
     <osgiVersion>${pkgVersion}</osgiVersion>
   </properties>
   
   <groupId>org.apache.felix.commons</groupId>
   <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
-  <version>1.3.4-0002-SNAPSHOT</version>
+  <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
   <packaging>bundle</packaging>
     
   <name>${pkgArtifactId} bundle</name>