dependency version update

according to releaseReadiness and jenkins integration-dependencyConvergence build
tidying up dependency management

Change-Id: Ib7e0d94d570a20a5ff87909a59b6356644708a2d
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/drop-test/pom.xml b/drop-test/pom.xml
index 2e44a34cc1f3f883121fc791f270837b14d0102f..a57d416da12b8b27ada49df10134c71126babcb9 100644 (file)
--- a/drop-test/pom.xml
+++ b/drop-test/pom.xml
@@ -14,7 +14,6 @@
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
     </scm>
     <properties>
-        <guava.version>14.0.1</guava.version>
         <xtend.version>2.4.3</xtend.version>
         <bundle.plugin.version>2.4.0</bundle.plugin.version>
         <maven.clean.plugin.version>2.5</maven.clean.plugin.version>
@@ -35,12 +34,10 @@
            <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-base</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>
           <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-management</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>    
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
@@ -54,16 +51,10 @@
          <dependency>
                <groupId>equinoxSDK381</groupId>
                <artifactId>org.eclipse.osgi</artifactId>
-               <version>3.8.1.v20120830-144521</version>
              </dependency>
              <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-          </dependency>
-          <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
           </dependency>
           <dependency>
                    <groupId>commons-codec</groupId>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index ae1ee310a385893550cf1c4b78667fd02f358df8..615e51c6c129d6ec60926c195ffb838da82b81d1 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>openflowplugin</artifactId>
     <packaging>bundle</packaging>
 
-    <properties>
-        <yang.prototype.version>1.0-SNAPSHOT</yang.prototype.version>
-        <yang.version>0.5.9-SNAPSHOT</yang.version>
-    </properties>
-
     <build>
         <plugins>
             <plugin>
@@ -42,12 +37,10 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal</artifactId>
-            <version>0.7.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal.connection</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
@@ -111,7 +104,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${yang.prototype.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index b4890017de23d502ae5753addeba461d0c7ed95a..bfe1e4cf5e073e6e43fdb562ce84254688724f25 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-      <slf4j.version>1.7.2</slf4j.version>
+      <slf4j.version>1.7.5</slf4j.version>
       <logback.version>1.0.9</logback.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.1-SNAPSHOT</openflowjava.version>
@@ -88,6 +88,11 @@
           <artifactId>model-flow-base</artifactId>
           <version>${controller.model.version}</version>
         </dependency>
+        <dependency>
+          <groupId>org.opendaylight.controller.model</groupId>
+          <artifactId>model-flow-management</artifactId>
+          <version>${controller.model.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.controller.model</groupId>
           <artifactId>model-flow-service</artifactId>
@@ -108,6 +113,21 @@
           <artifactId>sal-binding-api</artifactId>
           <version>${controller.model.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal</artifactId>
+            <version>0.7.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal.connection</artifactId>
+            <version>0.1.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-util</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>xml-apis</groupId>
@@ -143,6 +163,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+
         <dependency>
           <groupId>junit</groupId>
           <artifactId>junit</artifactId>

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index 8e71dd0d8fc9b3df18960d29955172dc708b283e..f7b66db034c61263b9ad40fcabc01488a4f9dde6 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -43,32 +43,26 @@
         <dependency>
             <artifactId>model-flow-base</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>model-flow-service</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>model-flow-statistics</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>model-flow-management</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <artifactId>model-inventory</artifactId>
             <groupId>org.opendaylight.controller.model</groupId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -78,7 +72,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.8.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/test-provider/pom.xml b/test-provider/pom.xml
index c7d65a70d1a61abeb604cd77009bffbfbd13c303..1810a3f7e7ccefcd0bde67d805f2216f35bb2d13 100644 (file)
--- a/test-provider/pom.xml
+++ b/test-provider/pom.xml
@@ -14,7 +14,6 @@
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowplugin.git</developerConnection>
     </scm>
     <properties>
-        <guava.version>14.0.1</guava.version>
         <xtend.version>2.4.3</xtend.version>
         <bundle.plugin.version>2.4.0</bundle.plugin.version>
         <maven.clean.plugin.version>2.5</maven.clean.plugin.version>
@@ -35,12 +34,10 @@
            <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-base</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>
           <dependency>
              <groupId>org.opendaylight.controller.model</groupId>
              <artifactId>model-flow-management</artifactId>
-             <version>1.0-SNAPSHOT</version>
            </dependency>    
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
@@ -58,12 +55,10 @@
          <dependency>
                <groupId>equinoxSDK381</groupId>
                <artifactId>org.eclipse.osgi</artifactId>
-               <version>3.8.1.v20120830-144521</version>
              </dependency>
              <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
           </dependency>
     </dependencies>