diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 5565eb6876..d5824ea738 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -34,19 +34,19 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-optional</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>kahadb</artifactId>
     </dependency>
     <dependency>
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index b6577712c4..76917de0f9 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -68,13 +68,13 @@
       <artifactId>camel-jms</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
 
     <!-- TODO we could maybe remove this dependency and use the Spring pool implementation? -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-pool</artifactId>
     </dependency>
     <dependency>
@@ -85,7 +85,7 @@
 
     <!-- testing helpers -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml
index 5d16d1bb53..86acce48d2 100644
--- a/activemq-console/pom.xml
+++ b/activemq-console/pom.xml
@@ -62,16 +62,16 @@
   <dependencies>
     <!-- activemq related dependencies -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
         
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 3f7076409b..dca38c4fdb 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -71,7 +71,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <optional>false</optional>
     </dependency>
@@ -213,7 +213,7 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
       <optional>false</optional>
       <type>test-jar</type>
diff --git a/activemq-fileserver/pom.xml b/activemq-fileserver/pom.xml
index 5035e8b874..e2ee451045 100755
--- a/activemq-fileserver/pom.xml
+++ b/activemq-fileserver/pom.xml
@@ -79,7 +79,7 @@
     </dependency>
 
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
index ba10673945..76875308db 100755
--- a/activemq-optional/pom.xml
+++ b/activemq-optional/pom.xml
@@ -49,20 +49,20 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>    
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
         
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index e35f7c5fc7..a8a259a45d 100755
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -52,11 +52,11 @@
       <artifactId>commons-logging-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <optional>true</optional>
     </dependency>
@@ -79,7 +79,7 @@
       <artifactId>commons-pool</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index b285f241f9..46dfc268b5 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
       <classifier>tests</classifier>
       <scope>test</scope>
     </dependency>
diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml
index 2351df08c0..d9b468eadc 100644
--- a/activemq-rar/pom.xml
+++ b/activemq-rar/pom.xml
@@ -34,7 +34,7 @@
   
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <exclusions>
         <exclusion>
@@ -78,7 +78,7 @@
            <artifactId>axion</artifactId>
         </exclusion>
         <exclusion>
-           <groupId>${pom.groupId}</groupId>
+           <groupId>${project.groupId}</groupId>
            <artifactId>activemq-jaas</artifactId>
         </exclusion>
         <exclusion>
diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml
index 4fb08e1eaf..5bb3332d8e 100644
--- a/activemq-run/pom.xml
+++ b/activemq-run/pom.xml
@@ -33,7 +33,7 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
   </dependencies>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index c2549f08fc..7c2295dd38 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -53,11 +53,11 @@
       <artifactId>commons-logging-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-pool</artifactId>
     </dependency>
     <dependency>
@@ -83,7 +83,7 @@
       <artifactId>spring-beans</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index e469ec5589..a9dc807bca 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -158,29 +158,29 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
 
     <!-- XMPP support -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-xmpp</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
-      <version>${pom.version}</version>
+      <version>${project.version}</version>
     </dependency>
 
     <!-- TODO this should not be needed, but transitive dependencies are not working -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml
index c7c6ae12ab..456d763710 100755
--- a/activemq-web-demo/pom.xml
+++ b/activemq-web-demo/pom.xml
@@ -71,17 +71,17 @@
 
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
 
     <!-- TODO this should not be needed, but transitive dependencies are not working -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index dd9f08126e..7e480a3648 100755
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -33,15 +33,15 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-        <groupId>${pom.groupId}</groupId>
+        <groupId>${project.groupId}</groupId>
         <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
diff --git a/activemq-xmpp/pom.xml b/activemq-xmpp/pom.xml
index 5d1b394354..8ffe124579 100755
--- a/activemq-xmpp/pom.xml
+++ b/activemq-xmpp/pom.xml
@@ -59,11 +59,11 @@
   <dependencies>
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
 
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 152fcaa59c..542edd921f 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -43,77 +43,77 @@
     
     <!-- activemq -->
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-all</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-camel</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-core</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activeio-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-console</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-fileserver</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-optional</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-pool</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-jaas</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-xmpp</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-web-console</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-rar</artifactId>
       <type>rar</type>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>activemq-run</artifactId>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>kahadb</artifactId>
     </dependency>
     
@@ -364,7 +364,7 @@
               <goal>unpack-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>${pom.groupId}</includeGroupIds>
+              <includeGroupIds>${project.groupId}</includeGroupIds>
               <includeArtifactIds>activemq-console</includeArtifactIds>
               <outputDirectory>target/classes</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
@@ -402,7 +402,7 @@
               <descriptors>
                  <descriptor>src/main/descriptors/unix-bin.xml</descriptor>  
               </descriptors>
-              <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+              <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
               <!--<appendAssemblyId>false</appendAssemblyId>-->
             </configuration>
           </execution>
@@ -416,7 +416,7 @@
               <descriptors>
                  <descriptor>src/main/descriptors/windows-bin.xml</descriptor>  
               </descriptors>
-              <!--<finalName>${pom.artifactId}-${pom.version}</finalName>-->
+              <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
               <!--<appendAssemblyId>false</appendAssemblyId>-->
             </configuration>
           </execution>
@@ -425,7 +425,7 @@
       <!-- plugin>
         <groupId>org.apache.activemq</groupId>
         <artifactId>maven-activemq-plugin</artifactId>
-        <version>${pom.version}</version>
+        <version>${project.version}</version>
         <configuration>
           <configFile>${basedir}/src/release/conf/activemq.xml</configFile>
           <url>broker:(tcp://localhost:61616)?useJmx=false</url>
diff --git a/pom.xml b/pom.xml
index 99c33ee21e..4f0d5bf2cf 100755
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
     <activemq.osgi.export.version>${project.version}</activemq.osgi.export.version>
     <activemq.osgi.import>${activemq.osgi.import.pkg}</activemq.osgi.import>
     <activemq.osgi.dynamic.import/>
-    <activemq.osgi.symbolic.name>${groupId}.${artifactId}</activemq.osgi.symbolic.name>
+    <activemq.osgi.symbolic.name>${project.groupId}.${project.artifactId}</activemq.osgi.symbolic.name>
 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <prerequisites>
@@ -737,7 +737,7 @@
       <dependency>
         <groupId>activesoap</groupId>
         <artifactId>jaxp-api</artifactId>
-        <version>1.3</version>
+        <version>${activesoap-version}</version>
       </dependency>
 
       <dependency>
@@ -1080,7 +1080,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Bundle-Name>${artifactId}</Bundle-Name>
+            <Bundle-Name>${project.artifactId}</Bundle-Name>
             <Bundle-SymbolicName>${activemq.osgi.symbolic.name}</Bundle-SymbolicName>
             <Export-Package>${activemq.osgi.export}</Export-Package>
             <Import-Package>${activemq.osgi.import}</Import-Package>
@@ -1124,6 +1124,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.4</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>