Import infrautils-artifacts in binding-parent

This is done at least in two places, with a myriad of other
places using the property instead of relying on upstream to declare
the correct version.

This patch fixes the layout up so we only only export the property
to one user, which unfortunately is not declared by upstream.

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

diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml
index ba53fdec2a3e931bf9398837c6fdaa3fb14091bc..0acb35aa4c5cab4d1e64d6f55af09bffe3b95e76 100644 (file)
--- a/arputil/arputil-impl/pom.xml
+++ b/arputil/arputil-impl/pom.xml
@@ -82,7 +82,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>metrics-api</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.inject</groupId>

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 0cf7ff34d0734c8076ae64953e3a512e045ccbd8..22beaa695b7c8b69940dc28ece55b494f12381a4 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -38,6 +38,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.infrautils</groupId>
+        <artifactId>infrautils-artifacts</artifactId>
+        <version>${genius.infrautils.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.serviceutils</groupId>
         <artifactId>serviceutils-artifacts</artifactId>

diff --git a/commons/testutils/pom.xml b/commons/testutils/pom.xml
index 4f58e174e6dabc3ca3dd1390e107bc8e0c9d9705..548838e16aa9c5bf906af274c676c6da4ef5b3fc 100644 (file)
--- a/commons/testutils/pom.xml
+++ b/commons/testutils/pom.xml
@@ -56,13 +56,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>inject.guice.testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/fcapsapplication/fcapsapplication-impl/pom.xml b/fcapsapplication/fcapsapplication-impl/pom.xml
index b3ab8a3e7540a1e688fb546c631d07b73c916e9c..8e05c244707f6b30bb549415a49c3019d277118a 100644 (file)
--- a/fcapsapplication/fcapsapplication-impl/pom.xml
+++ b/fcapsapplication/fcapsapplication-impl/pom.xml
@@ -27,7 +27,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>metrics-api</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>

diff --git a/fcapsmanager/countermanager/pom.xml b/fcapsmanager/countermanager/pom.xml
index ef35f236e325f2902adca14e7b848c9175031029..69c53506cb006ea9d44393bedae7f218867735bd 100644 (file)
--- a/fcapsmanager/countermanager/pom.xml
+++ b/fcapsmanager/countermanager/pom.xml
@@ -42,7 +42,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-util</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
   </dependencies>
   <build>

diff --git a/interfacemanager/interfacemanager-impl/pom.xml b/interfacemanager/interfacemanager-impl/pom.xml
index 5ea588033f1e40a9148f6439eba820ba285a2ab2..746c69fcfec949f4fd15b59bed8c51bc920ec82b 100644 (file)
--- a/interfacemanager/interfacemanager-impl/pom.xml
+++ b/interfacemanager/interfacemanager-impl/pom.xml
@@ -33,13 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.infrautils</groupId>
-        <artifactId>infrautils-artifacts</artifactId>
-        <version>${genius.infrautils.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-artifacts</artifactId>

diff --git a/ipv6util/api/pom.xml b/ipv6util/api/pom.xml
index 554c2563a1095e551e3df18bfcc7b525893639a6..752536eee0c83cec4a2b2df8b2db15f0e5a57746 100644 (file)
--- a/ipv6util/api/pom.xml
+++ b/ipv6util/api/pom.xml
@@ -52,8 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

diff --git a/ipv6util/impl/pom.xml b/ipv6util/impl/pom.xml
index aacfbcd1a9b0d6e0fbacf3218b830a1509549945..a6c49f7cd1fb2618f39dd20539db68fb2e8c9336 100644 (file)
--- a/ipv6util/impl/pom.xml
+++ b/ipv6util/impl/pom.xml
@@ -41,8 +41,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index eba86efb8ed372acdefac61854981f4291b5ff9d..5cb8547c112265705e8d39666325a419714f877b 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -35,13 +35,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.infrautils</groupId>
-        <artifactId>infrautils-artifacts</artifactId>
-        <version>${genius.infrautils.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.openflowplugin</groupId>
         <artifactId>openflowplugin-artifacts</artifactId>
@@ -235,8 +228,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>caches-test</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <!--Build Dependencies-->

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index bde65165bf48df527068885384fb7a8a0895d9f5..38bfd20884cfd8e7310ddd6e1445255de0dabde5 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -85,12 +85,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-util</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>inject</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>javax.annotation</groupId>
@@ -100,22 +98,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>jobcoordinator-api</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>caches-api</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
    <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>metrics-api</artifactId>
-      <version>${genius.infrautils.version}</version>
    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>caches-guava-impl</artifactId>
-      <version>${genius.infrautils.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -155,8 +149,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 713fcc30f4c80582fee1178183e4a2567b55dd0e..3ab50045c10eba5cf53014a77391ef7f7e927d3b 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -62,7 +62,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>diagstatus-api</artifactId>
-      <version>${genius.infrautils.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -88,8 +87,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.powermock</groupId>

diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml
index 8edfddc7137b27cbf4df8afbba905a565314953a..c7385547a3ada402d117daeb2b52d449bac46654 100644 (file)
--- a/mdsalutil/mdsalutil-testutils/pom.xml
+++ b/mdsalutil/mdsalutil-testutils/pom.xml
@@ -85,7 +85,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>jobcoordinator-impl</artifactId>
-      <version>${genius.infrautils.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -104,14 +103,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>inject.guice.testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>

diff --git a/networkutils/networkutils/pom.xml b/networkutils/networkutils/pom.xml
index 3fc62c6fa499e6285da4dd5d278661f974bf17f0..18338f13267dbd2f03f03f26995762bfe955936f 100644 (file)
--- a/networkutils/networkutils/pom.xml
+++ b/networkutils/networkutils/pom.xml
@@ -71,8 +71,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>infrautils-testutils</artifactId>
-      <version>${genius.infrautils.version}</version>
-      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>