From 6fdaf6295215a3a03ed1a113fa5ebc108e0ff41e Mon Sep 17 00:00:00 2001
From: Sam Hague <shague@redhat.com>
Date: Thu, 16 Oct 2014 08:07:17 -0400
Subject: [PATCH] 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>
---
 commons/integrationtest/pom.xml                 |  4 ----
 features/of-nxm-extensions/pom.xml              | 13 -------------
 features/ovs-sfc/pom.xml                        | 13 -------------
 features/ovsdb/pom.xml                          | 13 -------------
 integrationtest/pom.xml                         |  1 +
 of-extension/nicira-extension-config/pom.xml    |  2 +-
 of-extension/nx-ofjava/pom.xml                  |  2 +-
 of-extension/nx-sal-config/pom.xml              |  2 +-
 of-extension/nx-sal/pom.xml                     |  2 +-
 of-extension/openflowjava-nx-api-config/pom.xml |  2 +-
 of-extension/openflowjava-nx-config/pom.xml     |  2 +-
 of-extension/ovs-nx-api-config/pom.xml          |  2 +-
 of-extension/ovs-nx-config/pom.xml              |  2 +-
 13 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index df916d536..57b9ff51a 100644
--- 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 8f6f0c789..622fa09d7 100644
--- 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 9394f9f6a..4be69b08a 100644
--- 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 2d386be0b..2c173462f 100644
--- 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 761d87db4..35840cf51 100644
--- 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 31f0d9fe5..9ed7ce682 100644
--- 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 ce9c2ca8a..b0a8e1237 100644
--- 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 201f9f1c3..f1ad6b557 100644
--- 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 4d3567e03..b9e1babcb 100644
--- 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 9ddd9c3f4..685073025 100644
--- 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 ea704247b..bb4e2855c 100644
--- 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 24087b466..2bba12efa 100644
--- 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 38a6e4ab9..20cfeb9b5 100644
--- 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>
-- 
2.36.6