Use groupId and version from parent

To keep things consistent inherit artifact group identifiers and
versions from their parent. Use the same version everywhere.

Note that checkstyle and license bundles are getting a version bump to
1.9.0-SNAPSHOT as a result.

Change-Id: I3640869b59cc1e452155e59d19a77e1abacd5454
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/checkstyle/pom.xml b/checkstyle/pom.xml
index 06fd33641b179c9581dddfc9c685879d5ab87612..b25a46c1201bc33e6333807856a19d46ffd2935c 100644 (file)
--- a/checkstyle/pom.xml
+++ b/checkstyle/pom.xml
@@ -9,7 +9,6 @@
   </parent>
 
   <artifactId>checkstyle</artifactId>
-  <version>0.4.1-SNAPSHOT</version>
   <name>ODL :: odlparent :: ${project.artifactId}</name>
 
   <!--

diff --git a/deploy-site.xml b/deploy-site.xml
index 544e6c993b374e0eac7a55208f9d2a5e01b1969f..630705d0f7ca4ae2083b13cfd19f7a1cad6f9a48 100644 (file)
--- a/deploy-site.xml
+++ b/deploy-site.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.odlparent</groupId>
   <artifactId>deploy-site</artifactId>
-  <version>1.6.0-SNAPSHOT</version>
+  <version>1.9.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index f4137d317159e4b65992c04eea4b90dc88b44529..20a23b64c5b3e9b5f4b1a401ca4b6304403f3551 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -30,9 +30,7 @@
         <relativePath>../odlparent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 

diff --git a/feature3-repo-parent/pom.xml b/feature3-repo-parent/pom.xml
index 22f65f9407f1ae012e2f22fd330adfd9e772618a..b1fd3f3e612561ac8240271ed8943a7a8b58a07b 100644 (file)
--- a/feature3-repo-parent/pom.xml
+++ b/feature3-repo-parent/pom.xml
@@ -30,9 +30,7 @@
         <relativePath>../odlparent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature3-repo-parent</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 

diff --git a/features/pom.xml b/features/pom.xml
index 84fe6463ead1b9c748977817e3bcbfcf8e44a1f4..4f504ee4cc9d19f098a04f6d870c212caca29481 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,9 +18,7 @@
         <relativePath>../aggregator-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-aggregator</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 

diff --git a/features4/pom.xml b/features4/pom.xml
index 7e88f18f04fa0a9cfa47840a0b0d7ba951df07c4..bba4a21a581b387d0dc3c092cddc9287d294330a 100644 (file)
--- a/features4/pom.xml
+++ b/features4/pom.xml
@@ -18,9 +18,7 @@
         <relativePath>../aggregator-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features4-aggregator</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 

diff --git a/karaf-plugin/src/it/simple-it/pom.xml b/karaf-plugin/src/it/simple-it/pom.xml
index e353d3161e34977c741ccda4ce7a47d398a4e9f9..6bd1dc9ec735e2b40d2afcae4f2def206fa9f8f7 100644 (file)
--- a/karaf-plugin/src/it/simple-it/pom.xml
+++ b/karaf-plugin/src/it/simple-it/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>org.opendaylight.odlparent.it</groupId>
   <artifactId>simple-it</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.9.1-SNAPSHOT</version>
 
   <description>A simple IT verifying the basic use case.</description>
 

diff --git a/karaf4-plugin/src/it/simple-it/pom.xml b/karaf4-plugin/src/it/simple-it/pom.xml
index a4284c0b14e477ea123202f23869e39c4cbb3910..fbbf231522ebcba9ba5f73a696456530628e7d6c 100644 (file)
--- a/karaf4-plugin/src/it/simple-it/pom.xml
+++ b/karaf4-plugin/src/it/simple-it/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.opendaylight.odlparent.it</groupId>
   <artifactId>simple-it</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.9.1-SNAPSHOT</version>
 
   <description>A simple IT verifying the basic use case.</description>
 

diff --git a/license/pom.xml b/license/pom.xml
index 180eeefe2dbc2a5260e5957fbccaf44a2080f386..30000524db4b13249a365ebb12ef3ef8eaeebac5 100644 (file)
--- a/license/pom.xml
+++ b/license/pom.xml
@@ -9,7 +9,6 @@
   </parent>
 
   <artifactId>odl-license</artifactId>
-  <version>0.3.1-SNAPSHOT</version>
   <name>ODL :: odlparent :: ${project.artifactId}</name>
 
   <!--

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index c33b5c7de9e7985be38087534835ca82cc16d0ce..2cc5aa3432049c5b44073b8ace3737a671896017 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -72,7 +72,7 @@
          toolkit -->
     <checkstyle.version>2.17</checkstyle.version>
     <!-- Used in controller, packetcable -->
-    <odl.checkstyle.version>0.4.1-SNAPSHOT</odl.checkstyle.version>
+    <odl.checkstyle.version>1.9.1-SNAPSHOT</odl.checkstyle.version>
     <!-- Used in snmp4sdn; see also toolkit -->
     <compiler.version>${maven.compile.plugin.version}</compiler.version>
     <!-- Used in controller, l2switch, netide, openflowjava, openflowplugin, snbi, tsdr, ttp; see also toolkit -->
@@ -1438,12 +1438,12 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>${odl.checkstyle.version}</version>
+              <version>1.9.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>0.3.1-SNAPSHOT</version>
+              <version>1.9.1-SNAPSHOT</version>
             </dependency>
             <dependency>
               <groupId>com.github.sevntu.checkstyle</groupId>
@@ -1570,7 +1570,7 @@
                   <artifactItem>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>odl-license</artifactId>
-                    <version>0.3.1-SNAPSHOT</version>
+                    <version>1.9.1-SNAPSHOT</version>
                   </artifactItem>
                 </artifactItems>
                 <outputDirectory>${project.build.outputDirectory}</outputDirectory>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 1474f846c099935ce665953327c19db94d74043e..ec56980780af3239f307789cbcec4f77cca20d71 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -38,9 +38,7 @@
         <relativePath>../untested-single-feature-parent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 

diff --git a/single-feature3-parent/pom.xml b/single-feature3-parent/pom.xml
index da93b3759e2b8edc525865731f88c8bf3abc2c7a..00407dca170db9efecbf4688eb9f21fa1a197f9f 100644 (file)
--- a/single-feature3-parent/pom.xml
+++ b/single-feature3-parent/pom.xml
@@ -38,9 +38,7 @@
         <relativePath>../odlparent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature3-parent</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -76,4 +74,4 @@
         </site>
     </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 49a643630335b134670c0d92822c18a11b718c52..a5603b75a0abde9f530e886397f82e95171f4d8e 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -26,9 +26,7 @@
         <relativePath>../odlparent</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>untested-single-feature-parent</artifactId>
-    <version>1.9.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: odlparent :: ${project.artifactId}</name>
 
@@ -102,4 +100,4 @@
         </site>
     </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>