Drop the use of project.groupId

Spelling out org.opendaylight.yangtools makes things more
clear without being too verbose.

Change-Id: I10aabbd4a07eb6d6c25aa8f68157a889ee7ab43e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 2056feec8657883ab37841d8435feca6f600302c..3c55053407ed107359dbde07bb844e233d70f1cb 100644 (file)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -22,12 +22,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
             <version>2.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
             <version>2.1.2-SNAPSHOT</version>
             <scope>compile</scope>

diff --git a/yang/rfc6536-parser-support/pom.xml b/yang/rfc6536-parser-support/pom.xml
index 8e9a118ed41beee42ed9334b1526cf22f86c9b45..3832c7a33acef49fa3f874ecdb14006b22f8f687 100644 (file)
--- a/yang/rfc6536-parser-support/pom.xml
+++ b/yang/rfc6536-parser-support/pom.xml
@@ -23,21 +23,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc6536-model-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-rfc7950</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/rfc8040-parser-support/pom.xml b/yang/rfc8040-parser-support/pom.xml
index 6cc4fc2f32fc0e75f64a011f1c526c1f2a166619..7559b15a84aecf4dd497b1934280a45431e31f8d 100644 (file)
--- a/yang/rfc8040-parser-support/pom.xml
+++ b/yang/rfc8040-parser-support/pom.xml
@@ -23,21 +23,21 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>rfc8040-model-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-rfc7950</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml
index 5555ca7b7e86333244c021a985f6e7da3bd384cc..b59e8028ecb86e7fc8adf6dea885e7e2e79bf361 100644 (file)
--- a/yang/yang-data-impl/pom.xml
+++ b/yang/yang-data-impl/pom.xml
@@ -100,27 +100,27 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
         <dependency>
@@ -156,12 +156,12 @@
             <artifactId>xmlunit-legacy</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml
index a8dd94d0d6060e9bdd6715f0bbddcf8e81767228..6e0318b4a3748c07f434d556505bfdef5d30e754 100644 (file)
--- a/yang/yang-data-jaxen/pom.xml
+++ b/yang/yang-data-jaxen/pom.xml
@@ -33,19 +33,19 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
 
@@ -59,12 +59,12 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml
index 129ea982ec07d0cfe89a610108d83edae3dfc3bd..bc433f4dba9b65dcfcccc6a8166e20749b4f6e62 100644 (file)
--- a/yang/yang-data-transform/pom.xml
+++ b/yang/yang-data-transform/pom.xml
@@ -23,11 +23,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml
index 7d87a9e6fa1d8a98cae3cb278200faee96d4c5c3..919ac80e9f9b8baeb6cb5f1a3e474fe65a9c1fd5 100644 (file)
--- a/yang/yang-data-util/pom.xml
+++ b/yang/yang-data-util/pom.xml
@@ -23,25 +23,25 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odlext-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
 
         <!-- Test dependencies -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index c7adce0b558612f23acfc83a9d113ce06318815f..72b908f6a4289a924c4a94a00a92df8689273caf 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -65,16 +65,16 @@
             <version>3.3.9</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-test-util</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
         </dependency>
 
@@ -84,7 +84,7 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-maven-plugin-spi</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>

diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml
index 39ad3bf8ca75a845a52e01d4a937f7a9d613dcde..30ca4a620f705b1967bdcea6920b1d327b427d34 100644 (file)
--- a/yang/yang-model-util/pom.xml
+++ b/yang/yang-model-util/pom.xml
@@ -23,7 +23,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
 

diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml
index b5b13e2da260dd29c8d6e518b966accc935c6843..0e17053ecf129c14c32d79e5c2ee79decebe0c62 100644 (file)
--- a/yang/yang-model-validator/pom.xml
+++ b/yang/yang-model-validator/pom.xml
@@ -16,7 +16,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml
index 2f6cc1ac36a512bccc0740141a8e607ad303b048..3e04cce6d0c7f98be3f947bc394ff9efe88b4582 100644 (file)
--- a/yang/yang-parser-api/pom.xml
+++ b/yang/yang-parser-api/pom.xml
@@ -23,7 +23,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml
index 1a10cc547f04868c851c3b6f98339368a4b3f10d..f4dc47ec00c978d10eb7b8394a9eee8c159750f7 100644 (file)
--- a/yang/yang-parser-reactor/pom.xml
+++ b/yang/yang-parser-reactor/pom.xml
@@ -27,27 +27,27 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
     </dependencies>

diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml
index 6bc89c567c524a2109f3f1849b1834a743ce7057..acbf31f2d8defbbaa13df96044be0f31dafa331a 100644 (file)
--- a/yang/yang-parser-rfc7950/pom.xml
+++ b/yang/yang-parser-rfc7950/pom.xml
@@ -27,35 +27,35 @@
             <artifactId>guava</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-reactor</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-spi</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>openconfig-model-api</artifactId>
         </dependency>
 

diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml
index 80bee3006f098ef304aae64ca7b78c9fc597aedb..8dc3e0b48336547af3e2b2f8ccb63223d6ea396a 100644 (file)
--- a/yang/yang-parser-spi/pom.xml
+++ b/yang/yang-parser-spi/pom.xml
@@ -23,20 +23,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
             <scope>test</scope>
         </dependency>