Updated existing wrapper POMs with ASL headers and new naming and versioning conventions.

git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@517989 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/commons/antlr/pom.xml b/commons/antlr/pom.xml
index 3c39202..f4b0ab0 100644
--- a/commons/antlr/pom.xml
+++ b/commons/antlr/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>antlr</pkgArtifactId>
+        <pkgVersion>2.7.6</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>antlr-osgi</artifactId>
-    <version>2.7.6</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps antlr-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-
     <dependencies>
         <dependency>
             <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,8 +59,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>*</Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                         <Import-Package>!javax.*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/commons/cglib/pom.xml b/commons/cglib/pom.xml
index 1e059cd..1c9fef6 100644
--- a/commons/cglib/pom.xml
+++ b/commons/cglib/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>cglib-full</pkgArtifactId>
+        <pkgVersion>2.0.2</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>cglib-full-osgi</artifactId>
-    <version>2.0.2</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps cglib-full-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>cglib</groupId>
-            <artifactId>cglib-full</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
 
@@ -41,10 +60,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                         <DynamicImport-Package>
                             org.apache.tools.ant,org.apache.tools.ant.types,org.codehaus.aspectwerkz.hook,org.objectweb.asm.util
                         </DynamicImport-Package>
diff --git a/commons/commons-beanutils/pom.xml b/commons/commons-beanutils/pom.xml
index da7516e..f71ac82 100644
--- a/commons/commons-beanutils/pom.xml
+++ b/commons/commons-beanutils/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-beanutils</pkgArtifactId>
+        <pkgVersion>1.7.0</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-beanutils-osgi</artifactId>
-    <version>1.7.0</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-beanutils-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -38,7 +57,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -47,10 +65,12 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
                         <Export-Package>
                             !org.apache.commons.collections,
-                            *
+                            *;version=${pkgVersion}
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/commons/commons-codec/pom.xml b/commons/commons-codec/pom.xml
index b9896f5..0a22990 100644
--- a/commons/commons-codec/pom.xml
+++ b/commons/commons-codec/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-codec</pkgArtifactId>
+        <pkgVersion>1.3</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-codec-osgi</artifactId>
-    <version>1.2</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-codec-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,10 +59,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/commons-collections/pom.xml b/commons/commons-collections/pom.xml
index 2ae2aa5..15fa38d 100644
--- a/commons/commons-collections/pom.xml
+++ b/commons/commons-collections/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-collections</pkgArtifactId>
+        <pkgVersion>3.2</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-collections-osgi</artifactId>
-    <version>3.2</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-collections-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-
     <dependencies>
         <dependency>
             <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,9 +59,13 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                    <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-	            <Export-Package>*</Export-Package>
-                    <Import-Package>!org.apache.commons.collections.*</Import-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
+                        <Import-Package>
+                            !org.apache.commons.collections.*
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/commons-configuration/pom.xml b/commons/commons-configuration/pom.xml
index f3c8007..3ce2fd0 100644
--- a/commons/commons-configuration/pom.xml
+++ b/commons/commons-configuration/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-configuration</pkgArtifactId>
+        <pkgVersion>1.3</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-configuration-osgi</artifactId>
-    <version>1.3</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-configuration-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-beanutils</groupId>
@@ -79,7 +98,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -88,10 +106,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                         <DynamicImport-Package>
                             javax.naming,javax.servlet,javax.sql,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.commons.beanutils,org.apache.commons.codec.binary,org.apache.commons.digester,org.apache.commons.digester.substitution,org.apache.commons.digester.xmlrules,org.apache.commons.jxpath,org.apache.commons.jxpath.ri,org.apache.commons.jxpath.ri.compiler,org.apache.commons.jxpath.ri.model,org.w3c.dom,org.xml.sax,org.xml.sax.helpers
                         </DynamicImport-Package>
diff --git a/commons/commons-digester/pom.xml b/commons/commons-digester/pom.xml
index 81ddfb2..80b49ce 100644
--- a/commons/commons-digester/pom.xml
+++ b/commons/commons-digester/pom.xml
@@ -1,35 +1,55 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-digester</pkgArtifactId>
+        <pkgVersion>1.8</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-digester-osgi</artifactId>
-    <version>1.8</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-digester-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
+
     <dependencies>
         <dependency>
             <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-beanutils</groupId>
@@ -50,7 +70,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -59,10 +78,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                         <DynamicImport-Package>
                             org.apache.commons.logging.impl
                         </DynamicImport-Package>
diff --git a/commons/commons-el/pom.xml b/commons/commons-el/pom.xml
index 5713f5a..131e7c4 100644
--- a/commons/commons-el/pom.xml
+++ b/commons/commons-el/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-el</pkgArtifactId>
+        <pkgVersion>1.0</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-el-osgi</artifactId>
-    <version>1.0</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-el-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-el</groupId>
-            <artifactId>commons-el</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-logging</groupId>
@@ -38,7 +57,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -47,10 +65,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/commons-fileupload/pom.xml b/commons/commons-fileupload/pom.xml
index 6a69684..87e461a 100644
--- a/commons/commons-fileupload/pom.xml
+++ b/commons/commons-fileupload/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-fileupload</pkgArtifactId>
+        <pkgVersion>1.1.1</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-fileupload-osgi</artifactId>
-    <version>1.1.1</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-fileupload-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-io</groupId>
@@ -47,10 +66,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                         <DynamicImport-Package>
                             javax.portlet
                         </DynamicImport-Package>
diff --git a/commons/commons-httpclient/pom.xml b/commons/commons-httpclient/pom.xml
index aa174c4..4cb6fa3 100644
--- a/commons/commons-httpclient/pom.xml
+++ b/commons/commons-httpclient/pom.xml
@@ -1,35 +1,54 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-httpclient</pkgArtifactId>
+        <pkgVersion>3.0.1</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-httpclient-osgi</artifactId>
-    <version>3.0.1</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-httpclient-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
             <exclusions>
                 <exclusion>
                     <groupId>commons-codec</groupId>
@@ -46,7 +65,6 @@
             </exclusions>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -55,10 +73,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/commons-io/pom.xml b/commons/commons-io/pom.xml
index 1745488..d478188 100644
--- a/commons/commons-io/pom.xml
+++ b/commons/commons-io/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-io</pkgArtifactId>
+        <pkgVersion>1.3</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-io-osgi</artifactId>
-    <version>1.3</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-io-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,10 +59,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/commons-lang/pom.xml b/commons/commons-lang/pom.xml
index f2bf05c..2bc3953 100644
--- a/commons/commons-lang/pom.xml
+++ b/commons/commons-lang/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>commons-lang</pkgArtifactId>
+        <pkgVersion>2.2</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}.0</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>commons-lang-osgi</artifactId>
-    <version>2.2</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps commons-lang-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-    
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-    
     <dependencies>
         <dependency>
             <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,10 +59,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>
-                            *
-                        </Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>*;version=${pkgVersion}</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/commons/jzlib/pom.xml b/commons/jzlib/pom.xml
index 6132c97..44cf8b8 100644
--- a/commons/jzlib/pom.xml
+++ b/commons/jzlib/pom.xml
@@ -1,38 +1,56 @@
-<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>
         <artifactId>build</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
+    <properties>
+        <pkgArtifactId>jzlib</pkgArtifactId>
+        <pkgVersion>1.0.7</pkgVersion>
+        <pomVersion>0001</pomVersion>
+        <osgiVersion>${pkgVersion}</osgiVersion>
+    </properties>
     <groupId>org.apache.felix.commons</groupId>
-    <artifactId>jzlib-osgi</artifactId>
-    <version>1.0.7</version>
+    <artifactId>${pom.groupId}.${pkgArtifactId}</artifactId>
+    <version>${osgiVersion}-${pomVersion}-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
-    <name>${pom.artifactId} bundle</name>
+    <name>${pkgArtifactId} bundle</name>
     <description>
-        This bundle simply wraps jzlib-${pom.version}.jar.
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
     </description>
-
-    <organization> 
-        <name>Apache Felix Project</name> 
-        <url>http://incubator.apache.org/felix/</url> 
+    <organization>
+        <name>Apache Felix Project</name>
+        <url>http://incubator.apache.org/felix/</url>
     </organization>
-
     <dependencies>
         <dependency>
             <groupId>com.jcraft</groupId>
-            <artifactId>jzlib</artifactId>
-            <version>${pom.version}</version>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
         </dependency>
     </dependencies>
-
     <build>
         <plugins>
             <plugin>
@@ -41,8 +59,10 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>!META-INF.*,*</Export-Package>
+                        <Bundle-SymbolicName>
+                            ${pom.artifactId}
+                        </Bundle-SymbolicName>
+                        <Export-Package>!META-INF.*,*;version=${pkgVersion}</Export-Package>
                         <Import-Package>!*</Import-Package>
                     </instructions>
                 </configuration>
diff --git a/commons/pom.xml b/commons/pom.xml
index 3af8390..af82f48 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -1,13 +1,31 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<project>
-
+<?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</groupId>
         <artifactId>felix</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
     </parent>
-
-    <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <name>Apache Felix Commons: Build</name>
     <groupId>org.apache.felix.commons</groupId>
@@ -15,10 +33,14 @@
     <description>
         These subprojects wrap common third-party jars as OSGi bundles.
     </description>
-
     <modules>
+        <module>activation</module>
         <module>antlr</module>
+        <module>aopalliance</module>
+        <module>avalon-framework</module>
         <module>cglib</module>
+        <module>commons-attributes-api</module>
+        <module>commons-attributes-compiler</module>
         <module>commons-beanutils</module>
         <module>commons-codec</module>
         <module>commons-collections</module>
@@ -28,8 +50,23 @@
         <module>commons-fileupload</module>
         <module>commons-httpclient</module>
         <module>commons-io</module>
+        <module>commons-jxpath</module>
         <module>commons-lang</module>
+        <module>commons-logging</module>
+        <module>dom4j</module>
+        <module>ehcache</module>
+        <module>hibernate</module>
+        <!--<module>hsqldb</module>-->
+        <!--<module>jms</module>-->
+        <!--<module>jmxtools</module>-->
+        <module>jstl</module>
+        <!--<module>jta</module>-->
         <module>jzlib</module>
+        <!--<module>log4j</module>-->
+        <module>logkit</module>
+        <module>mail</module>
+        <module>servlet-api</module>
+        <module>xercesImpl</module>
+        <module>xml-resolver</module>
     </modules>
-
 </project>