Fix some compiler warnings.

1. Duplicated dependencies in many poms.
2. Dynamic versions for artifact ids.

Change-Id: I95ca1e1abd220b308a52e6b3d2b59bb978ec34fb
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index df916d5363885978eb50e220c064d813900914f6..57b9ff51ad92dd03dcc7cbed37dcbeb497dfa073 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -734,10 +734,6 @@
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>openstack.net-virt</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>openstack.net-virt</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>northbound</artifactId>

diff --git a/features/of-nxm-extensions/pom.xml b/features/of-nxm-extensions/pom.xml
index 8f6f0c789090700216d08b21d1402c9031cfcae1..622fa09d74993f7c513f857751371e6cbfedac5f 100644 (file)
--- a/features/of-nxm-extensions/pom.xml
+++ b/features/of-nxm-extensions/pom.xml
@@ -112,19 +112,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/features/ovs-sfc/pom.xml b/features/ovs-sfc/pom.xml
index 9394f9f6a8bcf8e9971f5b6fb6a2495403d1a43f..4be69b08a9b9ce365113ee855b0594e79bb04d7f 100644 (file)
--- a/features/ovs-sfc/pom.xml
+++ b/features/ovs-sfc/pom.xml
@@ -74,19 +74,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index 2d386be0b5745b0d24d8259737432fb767a933db..2c173462f4080a8948b7737bf8bcc333964bf085 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -157,19 +157,6 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>generate-resources</phase>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>

diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 761d87db4c71a897d7c4daad092a0b0bc0a7b2ff..35840cf511c6d3e9250da49078316285e1695a3a 100644 (file)
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -83,6 +83,7 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
+        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-depends-file</id>

diff --git a/of-extension/nicira-extension-config/pom.xml b/of-extension/nicira-extension-config/pom.xml
index 31f0d9fe5376094665a1ebba27db81d8fc828baa..9ed7ce6829f8ff86b973232bd3568f492ccbe17c 100644 (file)
--- a/of-extension/nicira-extension-config/pom.xml
+++ b/of-extension/nicira-extension-config/pom.xml
@@ -15,7 +15,7 @@
   </properties>
   <groupId>org.opendaylight.ovsdb</groupId>
   <artifactId>of-extension.nicira-extension-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <build>
     <plugins>

diff --git a/of-extension/nx-ofjava/pom.xml b/of-extension/nx-ofjava/pom.xml
index ce9c2ca8a2857e173c6341f47c15a8dd320e79cd..b0a8e12377a5fd4ad3da8286d87982829d2ff85e 100644 (file)
--- a/of-extension/nx-ofjava/pom.xml
+++ b/of-extension/nx-ofjava/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>of-extension.nx-ofjava</artifactId>
-    <version>${ovsdb.ofextension.version}</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Opendaylight OVS NX for OpenflowJava Models</name>
 

diff --git a/of-extension/nx-sal-config/pom.xml b/of-extension/nx-sal-config/pom.xml
index 201f9f1c329ef418d0f4ec56e3cee26ce9e00352..f1ad6b55726270d24d20bc3b7cdef3904990b8f2 100644 (file)
--- a/of-extension/nx-sal-config/pom.xml
+++ b/of-extension/nx-sal-config/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>of-extension.nx-sal-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/of-extension/nx-sal/pom.xml b/of-extension/nx-sal/pom.xml
index 4d3567e03e436dead136a5480f55f243ee2ac2f9..b9e1babcbe79366ec8f7c949dd8e8517ae3828c5 100644 (file)
--- a/of-extension/nx-sal/pom.xml
+++ b/of-extension/nx-sal/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>of-extension.nx-sal</artifactId>
-    <version>${ovsdb.ofextension.version}</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>Opendaylight OVS NX Extensions for SAL Flow Models</name>
 

diff --git a/of-extension/openflowjava-nx-api-config/pom.xml b/of-extension/openflowjava-nx-api-config/pom.xml
index 9ddd9c3f4e4789ec30529e93a45076b0d69b6b79..685073025c96ffb83cf39d84c13fed5c35b79f69 100644 (file)
--- a/of-extension/openflowjava-nx-api-config/pom.xml
+++ b/of-extension/openflowjava-nx-api-config/pom.xml
@@ -10,7 +10,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>of-extension.openflowjava-nx-api-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/of-extension/openflowjava-nx-config/pom.xml b/of-extension/openflowjava-nx-config/pom.xml
index ea704247bf3a4fa21a13075f5b04d4aef76a8e1e..bb4e2855c02117d6aa967c0cfd4d29d93694efa9 100644 (file)
--- a/of-extension/openflowjava-nx-config/pom.xml
+++ b/of-extension/openflowjava-nx-config/pom.xml
@@ -11,7 +11,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>of-extension.openflowjava-nx-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/of-extension/ovs-nx-api-config/pom.xml b/of-extension/ovs-nx-api-config/pom.xml
index 24087b4662252d987fa385273a2faf9de630d9f3..2bba12efa494e65ba6be50d092483474b23f14dd 100644 (file)
--- a/of-extension/ovs-nx-api-config/pom.xml
+++ b/of-extension/ovs-nx-api-config/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>of-extension.ovs-nx-api-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>

diff --git a/of-extension/ovs-nx-config/pom.xml b/of-extension/ovs-nx-config/pom.xml
index 38a6e4ab98b3269f7c8935202df7d0a907b285cc..20cfeb9b571fa5d51b46c133472bcd1800cc0f8a 100644 (file)
--- a/of-extension/ovs-nx-config/pom.xml
+++ b/of-extension/ovs-nx-config/pom.xml
@@ -11,7 +11,7 @@
   </parent>
 
   <artifactId>of-extension.ovs-nx-config</artifactId>
-  <version>${ovsdb.ofextension.version}</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>