diff --git a/ipojo/annotations/pom.xml b/ipojo/annotations/pom.xml
index 9501821..82a90be 100644
--- a/ipojo/annotations/pom.xml
+++ b/ipojo/annotations/pom.xml
@@ -56,7 +56,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>Apache Felix iPOJO Annotations</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Annotations </Bundle-Description>
             <Bundle-DocURL>http://felix.apache.org/site/how-to-use-ipojo-annotations.html</Bundle-DocURL>
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index fe3c325..db44098 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>xerces</groupId>
@@ -69,7 +69,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>iPOJO Ant Task</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Ant Task </Bundle-Description>
             <Bundle-DocURL>http://felix.apache.org/site/ipojo-ant-task.html</Bundle-DocURL>
diff --git a/ipojo/api/pom.xml b/ipojo/api/pom.xml
index 2864c25..d3aec14 100644
--- a/ipojo/api/pom.xml
+++ b/ipojo/api/pom.xml
@@ -43,7 +43,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}
+            <Bundle-SymbolicName>${project.artifactId}
             </Bundle-SymbolicName>
            <Bundle-DocURL>
              http://felix.apache.org/site/apache-felix-ipojo-api.html
@@ -101,17 +101,17 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.composite</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index 167f60c..4fcc4fa 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -55,7 +55,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>Apache Felix iPOJO Arch Command</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Arch command for Felix
             </Bundle-Description>
@@ -71,7 +71,7 @@
   <plugin>
     <groupId>org.apache.felix</groupId>
     <artifactId>maven-ipojo-plugin</artifactId>
-    <version>${pom.version}</version>
+    <version>${project.version}</version>
     <executions>
       <execution>
         <goals>
diff --git a/ipojo/composite/pom.xml b/ipojo/composite/pom.xml
index b99137f..ee5bac3 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/pom.xml
@@ -48,12 +48,12 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
   <build>
@@ -66,7 +66,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Composititon Framework
             </Bundle-Description>
@@ -107,7 +107,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index c73cd7f..7592ab3 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -127,7 +127,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml b/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
index fb103ef..57e69be 100644
--- a/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.client.annotation/pom.xml
@@ -51,7 +51,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Private-Package>ipojo.example.hello.client</Private-Package>
           </instructions>
         </configuration>
diff --git a/ipojo/examples/tutorial-maven/hello.client/pom.xml b/ipojo/examples/tutorial-maven/hello.client/pom.xml
index 3bd2d40..17c7716 100644
--- a/ipojo/examples/tutorial-maven/hello.client/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.client/pom.xml
@@ -57,7 +57,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               ipojo.example.hello.client
diff --git a/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml b/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
index 84eaea3..2b659f8 100644
--- a/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.impl.annotation/pom.xml
@@ -70,7 +70,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               ipojo.example.hello.impl
diff --git a/ipojo/examples/tutorial-maven/hello.impl/pom.xml b/ipojo/examples/tutorial-maven/hello.impl/pom.xml
index 404945e..213fbeb 100644
--- a/ipojo/examples/tutorial-maven/hello.impl/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.impl/pom.xml
@@ -40,7 +40,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               ipojo.example.hello.impl
diff --git a/ipojo/examples/tutorial-maven/hello.service/pom.xml b/ipojo/examples/tutorial-maven/hello.service/pom.xml
index 29e4e6d..352d69c 100644
--- a/ipojo/examples/tutorial-maven/hello.service/pom.xml
+++ b/ipojo/examples/tutorial-maven/hello.service/pom.xml
@@ -50,7 +50,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Export-Package>
               ipojo.example.hello
diff --git a/ipojo/handler/eventadmin/pom.xml b/ipojo/handler/eventadmin/pom.xml
index 04fad14..902ce9f 100644
--- a/ipojo/handler/eventadmin/pom.xml
+++ b/ipojo/handler/eventadmin/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -62,8 +62,8 @@
           <instructions>
             <Export-Package>org.apache.felix.ipojo.handlers.event.*;
               version="1.2.0"</Export-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Description> iPOJO Event Admin Handlers
             </Bundle-Description>
             <Bundle-DocURL>
@@ -78,7 +78,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/handler/extender/pom.xml b/ipojo/handler/extender/pom.xml
index 401b6db..05eab3a 100644
--- a/ipojo/handler/extender/pom.xml
+++ b/ipojo/handler/extender/pom.xml
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -63,8 +63,8 @@
             </Bundle-DocURL>
             <Private-Package> org.apache.felix.ipojo.handler.extender
             </Private-Package>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Bundle-Name>${pom.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Include-Resource> META-INF/LICENSE=LICENSE,
               META-INF/NOTICE=NOTICE </Include-Resource>
           </instructions>
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/handler/jmx/pom.xml b/ipojo/handler/jmx/pom.xml
index db7578b..4df40aa 100644
--- a/ipojo/handler/jmx/pom.xml
+++ b/ipojo/handler/jmx/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -57,8 +57,8 @@
           <instructions>
             <Private-Package> org.apache.felix.ipojo.handlers.jmx
             </Private-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
             <Bundle-Description> iPOJO JMX Handler </Bundle-Description>
             <Bundle-DocURL>
@@ -80,7 +80,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/handler/temporal/pom.xml b/ipojo/handler/temporal/pom.xml
index 23d03d5..1f8eeda 100644
--- a/ipojo/handler/temporal/pom.xml
+++ b/ipojo/handler/temporal/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
@@ -71,8 +71,8 @@
               org.apache.felix.ipojo.handler.temporal,
               org.objectweb.asm
             </Private-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Import-Package>!org.objectweb.asm.tree, *</Import-Package>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Temporal Dependency Handler
@@ -90,7 +90,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/handler/transaction/pom.xml b/ipojo/handler/transaction/pom.xml
index ebf018c..1d84f6c 100644
--- a/ipojo/handler/transaction/pom.xml
+++ b/ipojo/handler/transaction/pom.xml
@@ -16,7 +16,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}
+            <Bundle-SymbolicName>${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>org.apache.felix.ipojo.transaction
             </Private-Package>
@@ -27,7 +27,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
diff --git a/ipojo/handler/whiteboard/pom.xml b/ipojo/handler/whiteboard/pom.xml
index cb8c506..0275e66 100644
--- a/ipojo/handler/whiteboard/pom.xml
+++ b/ipojo/handler/whiteboard/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -57,8 +57,8 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-Name>${project.name}</Bundle-Name>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO White-Board Pattern Handler
             </Bundle-Description>
@@ -67,7 +67,7 @@
             </Bundle-DocURL>
             <Private-Package> org.apache.felix.ipojo.handler.wbp
             </Private-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
+            <Bundle-Name>${project.name}</Bundle-Name>
             <Include-Resource> META-INF/LICENSE=LICENSE,
               META-INF/NOTICE=NOTICE </Include-Resource>
           </instructions>
@@ -76,7 +76,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/junit4osgi/felix-command/pom.xml b/ipojo/junit4osgi/felix-command/pom.xml
index 2f9201a..4c16e17 100644
--- a/ipojo/junit4osgi/felix-command/pom.xml
+++ b/ipojo/junit4osgi/felix-command/pom.xml
@@ -31,7 +31,7 @@
   <version>1.1.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
       <version>1.1.0-SNAPSHOT</version>
     </dependency>
@@ -65,7 +65,7 @@
           <instructions>
             <Bundle-Name> Apache Felix iPOJO OSGi Junit Runner - Felix Command
             </Bundle-Name>
-            <Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
             <Private-Package> org.apache.felix.ipojo.junit4osgi.command
             </Private-Package>
             <Include-Resource> META-INF/LICENSE=LICENSE,
diff --git a/ipojo/junit4osgi/immediate-launcher/pom.xml b/ipojo/junit4osgi/immediate-launcher/pom.xml
index 854d21a..4f73a1d 100644
--- a/ipojo/junit4osgi/immediate-launcher/pom.xml
+++ b/ipojo/junit4osgi/immediate-launcher/pom.xml
@@ -31,7 +31,7 @@
   <version>1.1.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
       <version>1.1.0-SNAPSHOT</version>
     </dependency>
@@ -65,7 +65,7 @@
           <instructions>
             <Bundle-Name> Apache Felix iPOJO OSGi Junit Runner - Immediate Runner
             </Bundle-Name>
-            <Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
             <Private-Package> org.apache.felix.ipojo.junit4osgi.command
             </Private-Package>
             <Include-Resource> META-INF/LICENSE=LICENSE,
diff --git a/ipojo/junit4osgi/junit4osgi/pom.xml b/ipojo/junit4osgi/junit4osgi/pom.xml
index 6d9684b..c469c62 100644
--- a/ipojo/junit4osgi/junit4osgi/pom.xml
+++ b/ipojo/junit4osgi/junit4osgi/pom.xml
@@ -65,7 +65,7 @@
               Apache Felix iPOJO OSGi Junit Runner
             </Bundle-Name>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.junit4osgi.impl,
diff --git a/ipojo/junit4osgi/swing-runner/pom.xml b/ipojo/junit4osgi/swing-runner/pom.xml
index 68ceefb..bada98c 100644
--- a/ipojo/junit4osgi/swing-runner/pom.xml
+++ b/ipojo/junit4osgi/swing-runner/pom.xml
@@ -29,7 +29,7 @@
   <version>1.1.0-SNAPSHOT</version>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
       <version>1.1.0-SNAPSHOT</version>
     </dependency>
@@ -57,7 +57,7 @@
       <configuration>
         <instructions>
           <Bundle-Name>Apache Felix iPOJO OSGi Junit Runner - Swing Gui</Bundle-Name>
-          <Bundle-SymbolicName> ${pom.artifactId}</Bundle-SymbolicName>
+          <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
           <Private-Package> org.apache.felix.ipojo.junit4osgi.command
           </Private-Package>
           <Import-Package>org.osgi.framework;version=1.3,*
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index e7ffad5..2a09e61 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -62,7 +62,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>iPOJO Manipulator</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Manipulator </Bundle-Description>
             <Export-Package> org.apache.felix.ipojo.manipulator
diff --git a/ipojo/metadata/pom.xml b/ipojo/metadata/pom.xml
index cec2ea2..71ba27c 100644
--- a/ipojo/metadata/pom.xml
+++ b/ipojo/metadata/pom.xml
@@ -43,7 +43,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Bundle-Name>iPOJO Metadata</Bundle-Name>
             <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
             <Bundle-Description> iPOJO Metadata </Bundle-Description>
diff --git a/ipojo/online-manipulator/pom.xml b/ipojo/online-manipulator/pom.xml
index 46fe181..7d00924 100644
--- a/ipojo/online-manipulator/pom.xml
+++ b/ipojo/online-manipulator/pom.xml
@@ -43,7 +43,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Private-Package>org.apache.felix.ipojo.online.manipulator</Private-Package>
             <Bundle-DocURL>
               http://felix.apache.org/site/apache-felix-ipojo-online-manipulator.html
@@ -66,7 +66,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <executions>
           <execution>
             <goals>
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>asm</groupId>
diff --git a/ipojo/plugin/pom.xml b/ipojo/plugin/pom.xml
index edd61f9..65b220e 100644
--- a/ipojo/plugin/pom.xml
+++ b/ipojo/plugin/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
index fe7c083..d5cdb5f 100644
--- a/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
+++ b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
@@ -15,7 +15,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Private-Package>YOUR_PRIVATE_PACKAGES</Private-Package>
             <Import-Package>*</Import-Package> <!-- YOUR_IMPORTED_PACKAGES -->
             <Export-Package>*</Export-Package> <!-- YOUR_EXPORTED_PACKAGES -->
diff --git a/ipojo/tests/bundleAsiPOJO/tests/pom.xml b/ipojo/tests/bundleAsiPOJO/tests/pom.xml
index b55dd13..2dab748 100644
--- a/ipojo/tests/bundleAsiPOJO/tests/pom.xml
+++ b/ipojo/tests/bundleAsiPOJO/tests/pom.xml
@@ -105,7 +105,7 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO
       </artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
diff --git a/ipojo/tests/composite/composite-runtime/pom.xml b/ipojo/tests/composite/composite-runtime/pom.xml
index 9cf023a..4c1b359 100644
--- a/ipojo/tests/composite/composite-runtime/pom.xml
+++ b/ipojo/tests/composite/composite-runtime/pom.xml
@@ -77,7 +77,7 @@
               org.apache.felix.ipojo.test.composite.service, org.apache.felix.ipojo.test.composite.component, org.apache.felix.ipojo.test.composite.util
             </Export-Package>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test.composite.*
diff --git a/ipojo/tests/composite/import-export/pom.xml b/ipojo/tests/composite/import-export/pom.xml
index 51846fe..499eac9 100644
--- a/ipojo/tests/composite/import-export/pom.xml
+++ b/ipojo/tests/composite/import-export/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>ipojo.tests</groupId>
       <artifactId>tests.composite</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
   <build>
@@ -79,7 +79,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test.composite.exporter, org.apache.felix.ipojo.test.composite.importer
diff --git a/ipojo/tests/composite/service-instance/pom.xml b/ipojo/tests/composite/service-instance/pom.xml
index bd6acc6..68140e0 100644
--- a/ipojo/tests/composite/service-instance/pom.xml
+++ b/ipojo/tests/composite/service-instance/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>ipojo.tests</groupId>
 			<artifactId>tests.composite</artifactId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -79,7 +79,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test.composite.instantiator*, org.apache.felix.ipojo.test.composite.instance, org.apache.felix.ipojo.test.instance
diff --git a/ipojo/tests/composite/service-providing/pom.xml b/ipojo/tests/composite/service-providing/pom.xml
index eebf766..d6ac4e9 100644
--- a/ipojo/tests/composite/service-providing/pom.xml
+++ b/ipojo/tests/composite/service-providing/pom.xml
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>ipojo.tests</groupId>
 			<artifactId>tests.composite</artifactId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -79,7 +79,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test.composite.provides, org.apache.felix.ipojo.test.composite.test
diff --git a/ipojo/tests/core/annotations/pom.xml b/ipojo/tests/core/annotations/pom.xml
index 4e4501e..a7f69ff 100644
--- a/ipojo/tests/core/annotations/pom.xml
+++ b/ipojo/tests/core/annotations/pom.xml
@@ -99,7 +99,7 @@
               org.apache.felix.ipojo.test.scenarios.annotations.service
             </Export-Package>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/bad-configurations/pom.xml b/ipojo/tests/core/bad-configurations/pom.xml
index 00d9273..248455c 100644
--- a/ipojo/tests/core/bad-configurations/pom.xml
+++ b/ipojo/tests/core/bad-configurations/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.bad.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/configadmin/pom.xml b/ipojo/tests/core/configadmin/pom.xml
index 1c0eb12..114a31a 100644
--- a/ipojo/tests/core/configadmin/pom.xml
+++ b/ipojo/tests/core/configadmin/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.configadmin.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/configuration/pom.xml b/ipojo/tests/core/configuration/pom.xml
index f916852..9e411fa 100644
--- a/ipojo/tests/core/configuration/pom.xml
+++ b/ipojo/tests/core/configuration/pom.xml
@@ -72,7 +72,7 @@
               org.apache.felix.ipojo.test.scenarios.configuration.service
             </Export-Package>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/external-handlers/pom.xml b/ipojo/tests/core/external-handlers/pom.xml
index a1cf136..727f2f4 100644
--- a/ipojo/tests/core/external-handlers/pom.xml
+++ b/ipojo/tests/core/external-handlers/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.eh.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/factories/pom.xml b/ipojo/tests/core/factories/pom.xml
index e158755..d0926c1 100644
--- a/ipojo/tests/core/factories/pom.xml
+++ b/ipojo/tests/core/factories/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.factories.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/lifecycle-callback/pom.xml b/ipojo/tests/core/lifecycle-callback/pom.xml
index c96d996..99ff014 100644
--- a/ipojo/tests/core/lifecycle-callback/pom.xml
+++ b/ipojo/tests/core/lifecycle-callback/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.lifecycle.callback.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/lifecycle-controller/pom.xml b/ipojo/tests/core/lifecycle-controller/pom.xml
index 3ef699c..867ac13 100644
--- a/ipojo/tests/core/lifecycle-controller/pom.xml
+++ b/ipojo/tests/core/lifecycle-controller/pom.xml
@@ -72,7 +72,7 @@
 							org.apache.felix.ipojo.test.scenarios.lfc.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
index 9b0f4ca..6cf0a8c 100644
--- a/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
+++ b/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
@@ -61,7 +61,7 @@
 		<dependency>
 			<groupId>ipojo.tests</groupId>
 			<artifactId>tests.core.service.dependency</artifactId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -73,7 +73,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test.scenarios.service.dependency.dynamic.priority, org.apache.felix.ipojo.test.scenarios.service.dependency.policies, org.apache.felix.ipojo.test.scenarios.service.dependency.statics, org.apache.felix.ipojo.test.scenarios.util
diff --git a/ipojo/tests/core/service-dependency-comparator/pom.xml b/ipojo/tests/core/service-dependency-comparator/pom.xml
index 0529c5b..6f71513 100644
--- a/ipojo/tests/core/service-dependency-comparator/pom.xml
+++ b/ipojo/tests/core/service-dependency-comparator/pom.xml
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>ipojo.tests</groupId>
 			<artifactId>tests.core.service.dependency</artifactId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
@@ -73,7 +73,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test.scenarios.service.dependency.comparator,
diff --git a/ipojo/tests/core/service-dependency-filter/pom.xml b/ipojo/tests/core/service-dependency-filter/pom.xml
index 7936d7e..3c1a5bc 100644
--- a/ipojo/tests/core/service-dependency-filter/pom.xml
+++ b/ipojo/tests/core/service-dependency-filter/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>ipojo.tests</groupId>
       <artifactId>tests.core.service.dependency</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
 		<groupId>org.osgi</groupId>
@@ -73,7 +73,7 @@
         <configuration>
           <instructions>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test.scenarios.service.dependency.filter, org.apache.felix.ipojo.test.scenarios.service.dependency.filter.component, org.apache.felix.ipojo.test.scenarios.util
diff --git a/ipojo/tests/core/service-dependency/pom.xml b/ipojo/tests/core/service-dependency/pom.xml
index 609e2ec..f55135e 100644
--- a/ipojo/tests/core/service-dependency/pom.xml
+++ b/ipojo/tests/core/service-dependency/pom.xml
@@ -71,7 +71,7 @@
               org.apache.felix.ipojo.test.scenarios.service.dependency.service
             </Export-Package>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/core/service-providing-strategies/pom.xml b/ipojo/tests/core/service-providing-strategies/pom.xml
index 6456700..0a7a366 100755
--- a/ipojo/tests/core/service-providing-strategies/pom.xml
+++ b/ipojo/tests/core/service-providing-strategies/pom.xml
@@ -61,7 +61,7 @@
 		<dependency>
 			<artifactId>tests.core.ps</artifactId>
 			<groupId>ipojo.tests</groupId>
-			<version>${pom.version}</version>
+			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 	<build>
@@ -73,7 +73,7 @@
 				<configuration>
 					<instructions>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test.scenarios.component.strategies, org.apache.felix.ipojo.test.scenarios.ps.strategies
diff --git a/ipojo/tests/core/service-providing/pom.xml b/ipojo/tests/core/service-providing/pom.xml
index fb26d28..963d7e2 100644
--- a/ipojo/tests/core/service-providing/pom.xml
+++ b/ipojo/tests/core/service-providing/pom.xml
@@ -72,7 +72,7 @@
               org.apache.felix.ipojo.test.scenarios.ps.service
             </Export-Package>
             <Bundle-SymbolicName>
-              ${pom.artifactId}
+              ${project.artifactId}
             </Bundle-SymbolicName>
             <Private-Package>
               org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/handler/temporal/pom.xml b/ipojo/tests/handler/temporal/pom.xml
index 7dc3561..7e7cad8 100644
--- a/ipojo/tests/handler/temporal/pom.xml
+++ b/ipojo/tests/handler/temporal/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.temporal.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/handler/transaction/pom.xml b/ipojo/tests/handler/transaction/pom.xml
index 5345de8..8dadf3a 100644
--- a/ipojo/tests/handler/transaction/pom.xml
+++ b/ipojo/tests/handler/transaction/pom.xml
@@ -50,7 +50,7 @@
         <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.handler.transaction</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <dependency>
diff --git a/ipojo/tests/manipulator/creation/pom.xml b/ipojo/tests/manipulator/creation/pom.xml
index b69c6f4..027daaf 100644
--- a/ipojo/tests/manipulator/creation/pom.xml
+++ b/ipojo/tests/manipulator/creation/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.manipulation.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/manipulation/pom.xml b/ipojo/tests/manipulator/manipulation/pom.xml
index a6b2c8f..d48811c 100644
--- a/ipojo/tests/manipulator/manipulation/pom.xml
+++ b/ipojo/tests/manipulator/manipulation/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.manipulation.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/manipulator-java5/pom.xml b/ipojo/tests/manipulator/manipulator-java5/pom.xml
index ff2a824..218346f 100644
--- a/ipojo/tests/manipulator/manipulator-java5/pom.xml
+++ b/ipojo/tests/manipulator/manipulator-java5/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.manipulation.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/metadata/pom.xml b/ipojo/tests/manipulator/metadata/pom.xml
index 34df90a..56bcfc7 100644
--- a/ipojo/tests/manipulator/metadata/pom.xml
+++ b/ipojo/tests/manipulator/metadata/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.manipulation.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/tests/manipulator/primitives/pom.xml b/ipojo/tests/manipulator/primitives/pom.xml
index b69376f..2e24d24 100644
--- a/ipojo/tests/manipulator/primitives/pom.xml
+++ b/ipojo/tests/manipulator/primitives/pom.xml
@@ -71,7 +71,7 @@
 							org.apache.felix.ipojo.test.scenarios.manipulation.service
 						</Export-Package>
 						<Bundle-SymbolicName>
-							${pom.artifactId}
+							${project.artifactId}
 						</Bundle-SymbolicName>
 						<Private-Package>
 							org.apache.felix.ipojo.test*
diff --git a/ipojo/webconsole-plugin/pom.xml b/ipojo/webconsole-plugin/pom.xml
index bfa2306..cf1857e 100644
--- a/ipojo/webconsole-plugin/pom.xml
+++ b/ipojo/webconsole-plugin/pom.xml
@@ -52,7 +52,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>${pom.artifactId}
+            <Bundle-SymbolicName>${project.artifactId}
             </Bundle-SymbolicName>
              <Bundle-DocURL>
               http://felix.apache.org/site/ipojo-webconsole-plugin.html