Declare api artifacts in genius-artifacts

This reduces the number of project.version declarations throughout
the project, improving consistency.

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

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
index ebd918238ee1724fbbba84f173d1fc2afd458628..e413abf2bfec516fce820c2ba95f49e16f3e7e13 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/pom.xml
@@ -35,17 +35,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>arputil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>ipv6util-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>

diff --git a/alivenessmonitor/alivenessmonitor-impl/pom.xml b/alivenessmonitor/alivenessmonitor-impl/pom.xml
index a5d70f073c677169567edb808b5588d25755d454..827cec3b8df570b66b5e58e3809b683dc51bccfb 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-impl/pom.xml
@@ -66,12 +66,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>ipv6util-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml
index 995e5c322dbefa9c2f7cc2fa989fb31ec3392190..c9e859a65bd7d13c12a7d33e6d83ebb3a48010b0 100644 (file)
--- a/arputil/arputil-impl/pom.xml
+++ b/arputil/arputil-impl/pom.xml
@@ -29,12 +29,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>arputil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
@@ -51,7 +49,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 58de50f30b3d1b1474613f33b8dff6ad76078a91..c355fc633ce3025e544009c978b9b7d7b6b54466 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -33,6 +33,37 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>arputil-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>idmanager-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>interfacemanager-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>ipv6util-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>itm-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>lockmanager-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
       <!-- Karaf Features -->
       <dependency>
         <groupId>${project.groupId}</groupId>

diff --git a/commons/testutils/pom.xml b/commons/testutils/pom.xml
index 548838e16aa9c5bf906af274c676c6da4ef5b3fc..32730c1dc8d30340cf806950ee577e73e97462e6 100644 (file)
--- a/commons/testutils/pom.xml
+++ b/commons/testutils/pom.xml
@@ -27,7 +27,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
 
     <!-- Do *NOT* use <scope>test here... the project which depends on this project will use <scope>test for
@@ -94,7 +93,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>itm-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
 </project>

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index f29bdb3fbd37088a650ccfb3c82b85f571bceea8..38e1dbe84e6a9483f319ddc771e083da311a263e 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -31,6 +31,13 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>genius-artifacts</artifactId>
+        <version>${project.version}</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -153,7 +160,6 @@
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>itm-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>

diff --git a/idmanager/idmanager-impl/pom.xml b/idmanager/idmanager-impl/pom.xml
index 34fb7c91896b2049e72296eda6d5c50e042118a0..06bb24d9c5e2c223884207d84c7652a12a27e9d3 100644 (file)
--- a/idmanager/idmanager-impl/pom.xml
+++ b/idmanager/idmanager-impl/pom.xml
@@ -28,12 +28,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>lockmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>

diff --git a/idmanager/idmanager-shell/pom.xml b/idmanager/idmanager-shell/pom.xml
index e463e252be8607899195966c9eb39d45c737a492..a4e6b521a199c6f835365f1f1a73625775a2118c 100644 (file)
--- a/idmanager/idmanager-shell/pom.xml
+++ b/idmanager/idmanager-shell/pom.xml
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>mdsalutil-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/interfacemanager/interfacemanager-api/pom.xml b/interfacemanager/interfacemanager-api/pom.xml
index 2756fc67f582971f257b8f0c1a626aa6952e67a0..22de431d1c3a3cb0eb15981b4e3424d16384ca97 100644 (file)
--- a/interfacemanager/interfacemanager-api/pom.xml
+++ b/interfacemanager/interfacemanager-api/pom.xml
@@ -52,7 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>

diff --git a/interfacemanager/interfacemanager-impl/pom.xml b/interfacemanager/interfacemanager-impl/pom.xml
index 826d472fedfcf87c53dfe2309e24db19cb8d537e..fa8b613bec078fdc99bad61ad7af1530e4d53999 100644 (file)
--- a/interfacemanager/interfacemanager-impl/pom.xml
+++ b/interfacemanager/interfacemanager-impl/pom.xml
@@ -28,7 +28,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
@@ -57,7 +56,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>

diff --git a/interfacemanager/interfacemanager-shell/pom.xml b/interfacemanager/interfacemanager-shell/pom.xml
index d9892ba3872f95b6747aefe210869e6a3c18e2be..cbd944e25d8ea17dbc13fa56152d3f69b8951d52 100644 (file)
--- a/interfacemanager/interfacemanager-shell/pom.xml
+++ b/interfacemanager/interfacemanager-shell/pom.xml
@@ -28,7 +28,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>interfacemanager-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>

diff --git a/ipv6util/impl/pom.xml b/ipv6util/impl/pom.xml
index a6c49f7cd1fb2618f39dd20539db68fb2e8c9336..cad013fcdd1bb147fee623332170be9f1a42e31d 100644 (file)
--- a/ipv6util/impl/pom.xml
+++ b/ipv6util/impl/pom.xml
@@ -27,12 +27,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ipv6util-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/itm/itm-api/pom.xml b/itm/itm-api/pom.xml
index f37ef06d5aa61abcd9927d9573eb1cf4f56d6cdf..3d330c3e4c6b0eaeefaf95341107e02430663b8d 100644 (file)
--- a/itm/itm-api/pom.xml
+++ b/itm/itm-api/pom.xml
@@ -29,7 +29,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index e4cb48fe471e83e188d867bbb1772846639328b1..daf12a73e8de28b924dda6f93398c840605035ff 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -30,12 +30,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>itm-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>interfacemanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.serviceutils</groupId>
@@ -93,7 +91,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>

diff --git a/lockmanager/lockmanager-impl/pom.xml b/lockmanager/lockmanager-impl/pom.xml
index 0f98fba1c803e7c5423cd7876751eb753025ce77..55b2c78c0405a038b0a0c3a413e458655db22e88 100644 (file)
--- a/lockmanager/lockmanager-impl/pom.xml
+++ b/lockmanager/lockmanager-impl/pom.xml
@@ -33,12 +33,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>lockmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 295c65f96b9fdee5973de67f41e5299b39ad5df3..161bd51d369f220adf1c6a2112f10fdedec55a5c 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -75,7 +75,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>ipv6util-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 79ad58ae5234e14eb338da4ec2a1893f9ac7ac84..68c5669f19737ce6635b4b7651165708bbb90770 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -152,7 +152,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml
index c7385547a3ada402d117daeb2b52d449bac46654..c9807d26102cbb69feca9b8d8ef198c833f91549 100644 (file)
--- a/mdsalutil/mdsalutil-testutils/pom.xml
+++ b/mdsalutil/mdsalutil-testutils/pom.xml
@@ -27,7 +27,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>

diff --git a/networkutils/networkutils/pom.xml b/networkutils/networkutils/pom.xml
index 18338f13267dbd2f03f03f26995762bfe955936f..4a843fd4d4be191254d675742619df2fd30245a7 100644 (file)
--- a/networkutils/networkutils/pom.xml
+++ b/networkutils/networkutils/pom.xml
@@ -33,12 +33,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>idmanager-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>mdsalutil-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>