diff --git a/archetype-common/pom.xml b/archetype-common/pom.xml
index b9a3568..86aaa88 100644
--- a/archetype-common/pom.xml
+++ b/archetype-common/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>archetype-common</artifactId>
diff --git a/archetype-models/archetype-catalog/pom.xml b/archetype-models/archetype-catalog/pom.xml
index c166ae1..969846a 100644
--- a/archetype-models/archetype-catalog/pom.xml
+++ b/archetype-models/archetype-catalog/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>archetype-models</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>archetype-catalog</artifactId>
diff --git a/archetype-models/archetype-descriptor/pom.xml b/archetype-models/archetype-descriptor/pom.xml
index 10ef915..52d0bd4 100644
--- a/archetype-models/archetype-descriptor/pom.xml
+++ b/archetype-models/archetype-descriptor/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>archetype-models</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>archetype-descriptor</artifactId>
diff --git a/archetype-models/pom.xml b/archetype-models/pom.xml
index 99b8d78..73c450c 100644
--- a/archetype-models/pom.xml
+++ b/archetype-models/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>archetype-models</artifactId>
diff --git a/archetype-packaging/pom.xml b/archetype-packaging/pom.xml
index dc2f2ac..360d9e5 100644
--- a/archetype-packaging/pom.xml
+++ b/archetype-packaging/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>archetype-packaging</artifactId>
diff --git a/archetype-samples/mojo/pom.xml b/archetype-samples/mojo/pom.xml
index 74fa710..8a29cbf 100644
--- a/archetype-samples/mojo/pom.xml
+++ b/archetype-samples/mojo/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.maven.archetypes</groupId>
     <artifactId>archetype-samples</artifactId>
-    <version>2.0-alpha-5-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>maven-mojo</artifactId>
diff --git a/archetype-samples/pom.xml b/archetype-samples/pom.xml
index 145c10d..08a6791 100644
--- a/archetype-samples/pom.xml
+++ b/archetype-samples/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>maven-archetype</artifactId>
     <groupId>org.apache.maven.archetype</groupId>
-    <version>2.0-alpha-5-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <groupId>org.apache.maven.archetypes</groupId>
diff --git a/archetype-samples/quickstart/pom.xml b/archetype-samples/quickstart/pom.xml
index 4a8bf41..68895ea 100644
--- a/archetype-samples/quickstart/pom.xml
+++ b/archetype-samples/quickstart/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.apache.maven.archetypes</groupId>
     <artifactId>archetype-samples</artifactId>
-    <version>2.0-alpha-5-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <artifactId>maven-quickstart</artifactId>
diff --git a/archetype-samples/webapp/pom.xml b/archetype-samples/webapp/pom.xml
index d65a097..95dad5d 100644
--- a/archetype-samples/webapp/pom.xml
+++ b/archetype-samples/webapp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.maven.archetypes</groupId>
         <artifactId>archetype-samples</artifactId>
-        <version>2.0-alpha-5-SNAPSHOT</version>
+        <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
     </parent>
 
     <artifactId>maven-webapp</artifactId>
diff --git a/maven-archetype-plugin/pom.xml b/maven-archetype-plugin/pom.xml
index 8c03d99..a4e2c79 100644
--- a/maven-archetype-plugin/pom.xml
+++ b/maven-archetype-plugin/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.maven.archetype</groupId>
     <artifactId>maven-archetype</artifactId>
-    <version>3.2.0-SNAPSHOT</version>
+    <!--version>3.2.0-SNAPSHOT</version--><!-- not needed any more with build/consumer POM -->
   </parent>
 
   <!--
diff --git a/pom.xml b/pom.xml
index 7aae737..ca05ff3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.archetype</groupId>
   <artifactId>maven-archetype</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>3.2.0-${revlist}-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Maven Archetype</name>
@@ -90,7 +90,8 @@
         <artifactId>maven-compat</artifactId>
         <version>${mavenVersion}</version>
       </dependency>
-      <dependency>
+      <!-- not needed any more with build/consumer POM -->
+      <!--dependency>
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-catalog</artifactId>
         <version>${project.version}</version>
@@ -109,7 +110,7 @@
         <groupId>org.apache.maven.archetype</groupId>
         <artifactId>archetype-packaging</artifactId>
         <version>${project.version}</version>
-      </dependency>
+      </dependency-->
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-artifact</artifactId>