Maintain separation between the artifact id and the version to help p…

…revent merge conflicts between commits changing the GA and those changing the V.
wildfly · Feb 13, 2018 · 6f5f9d3 · 6f5f9d3
1 parent b6c4ad9
commit 6f5f9d3
Show file tree

Hide file tree

Showing 130 changed files with 553 additions and 33 deletions.
diff --git a/appclient/pom.xml b/appclient/pom.xml
@@ -31,6 +31,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/batch/extension-jberet/pom.xml b/batch/extension-jberet/pom.xml
@@ -30,6 +30,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-batch-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/batch/extension/pom.xml b/batch/extension/pom.xml
@@ -30,6 +30,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-batch-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/batch/pom.xml b/batch/pom.xml
@@ -30,6 +30,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>

diff --git a/bean-validation/pom.xml b/bean-validation/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/build/pom.xml b/build/pom.xml
@@ -30,6 +30,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/client/ejb-legacy/pom.xml b/client/ejb-legacy/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/client/ejb/pom.xml b/client/ejb/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/client/jms/pom.xml b/client/jms/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
@@ -80,7 +84,7 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-jms-client</artifactId>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>artemis-selector</artifactId>

diff --git a/client/shade/pom.xml b/client/shade/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>

diff --git a/clustering/api/pom.xml b/clustering/api/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/common/pom.xml b/clustering/common/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ee/infinispan/pom.xml b/clustering/ee/infinispan/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-ee</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ee/pom.xml b/clustering/ee/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ee/spi/pom.xml b/clustering/ee/spi/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-ee</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ejb/infinispan/pom.xml b/clustering/ejb/infinispan/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-ejb</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ejb/pom.xml b/clustering/ejb/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/ejb/spi/pom.xml b/clustering/ejb/spi/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-ejb</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/infinispan/extension/pom.xml b/clustering/infinispan/extension/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-infinispan</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/infinispan/pom.xml b/clustering/infinispan/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/infinispan/spi/pom.xml b/clustering/infinispan/spi/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-infinispan</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/jgroups/api/pom.xml b/clustering/jgroups/api/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-jgroups</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/jgroups/extension/pom.xml b/clustering/jgroups/extension/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-jgroups</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/jgroups/pom.xml b/clustering/jgroups/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/jgroups/spi/pom.xml b/clustering/jgroups/spi/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-jgroups</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/marshalling/api/pom.xml b/clustering/marshalling/api/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-marshalling</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/marshalling/infinispan/pom.xml b/clustering/marshalling/infinispan/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-marshalling</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/marshalling/jboss/pom.xml b/clustering/marshalling/jboss/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-marshalling</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/marshalling/pom.xml b/clustering/marshalling/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/marshalling/spi/pom.xml b/clustering/marshalling/spi/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-marshalling</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/pom.xml b/clustering/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-parent</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/server/pom.xml b/clustering/server/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/service/pom.xml b/clustering/service/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/singleton/api/pom.xml b/clustering/singleton/api/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-singleton</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>
 

diff --git a/clustering/singleton/extension/pom.xml b/clustering/singleton/extension/pom.xml
@@ -29,6 +29,10 @@
     <parent>
         <groupId>org.wildfly</groupId>
         <artifactId>wildfly-clustering-singleton</artifactId>
+        <!--
+        Maintain separation between the artifact id and the version to help prevent
+        merge conflicts between commits changing the GA and those changing the V.
+        -->
         <version>12.0.0.Alpha1-SNAPSHOT</version>
     </parent>