You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2020/07/05 09:27:34 UTC

[maven-archetype] branch buildconsumer updated: test build vs consumer POM features

This is an automated email from the ASF dual-hosted git repository.

hboutemy pushed a commit to branch buildconsumer
in repository https://gitbox.apache.org/repos/asf/maven-archetype.git


The following commit(s) were added to refs/heads/buildconsumer by this push:
     new 4db84bb  test build vs consumer POM features
4db84bb is described below

commit 4db84bbb05986c6134d5bf5624cee7781fa61606
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jul 5 11:27:23 2020 +0200

    test build vs consumer POM features
    
    - automatic parent POM version
    - auto-version in reactor
    - CI-friendly version containing ${revision}
---
 archetype-common/pom.xml                      | 2 +-
 archetype-models/archetype-catalog/pom.xml    | 2 +-
 archetype-models/archetype-descriptor/pom.xml | 2 +-
 archetype-models/pom.xml                      | 2 +-
 archetype-packaging/pom.xml                   | 2 +-
 archetype-samples/mojo/pom.xml                | 2 +-
 archetype-samples/pom.xml                     | 2 +-
 archetype-samples/quickstart/pom.xml          | 2 +-
 archetype-samples/webapp/pom.xml              | 2 +-
 maven-archetype-plugin/pom.xml                | 2 +-
 pom.xml                                       | 7 ++++---
 11 files changed, 14 insertions(+), 13 deletions(-)

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 @@ under the License.
   <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>