Replace harcoded URLs, updated out of date dependencies

1) Replaced hardcoded URLs with nexusproxy variables
2) Replaced out of date dependencies that were hardcoded
   with variables / dependency management.

Change-Id: Iea97ba79a532f5f73f31b80f63e6ef1072291acb
Signed-off-by: Devin Avery <devin.avery@brocade.com>

diff --git a/pom.xml b/pom.xml
index d283a1ab43b0f0b192625dd082e6a467d1acdea8..bdd0463bc8eb5ee89a541548294e657d46ec053f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
       <controller.model.version>1.1-SNAPSHOT</controller.model.version>
       <sal.api.version>0.8.1-SNAPSHOT</sal.api.version>
       <sal.connection.api.version>0.1.2-SNAPSHOT</sal.connection.api.version>
+      <sal.common.util.version>1.1-SNAPSHOT</sal.common.util.version>
       <netconf.parent.version>0.2.5-SNAPSHOT</netconf.parent.version>
       <config.parent.version>0.2.5-SNAPSHOT</config.parent.version>
       <build.helper.version>1.8</build.helper.version>
@@ -65,10 +66,16 @@
       <sonar.profile>Sonar way with Findbugs</sonar.profile>
 
       <karaf.distro.empty.version>1.4.2-SNAPSHOT</karaf.distro.empty.version>
+      <yang.binding.version>0.6.2-SNAPSHOT</yang.binding.version>
     </properties>
 
     <dependencyManagement>
       <dependencies>
+         <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-binding</artifactId>
+            <version>${yang.binding.version}</version>
+        </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
           <artifactId>openflow-protocol-impl</artifactId>
@@ -131,6 +138,11 @@
         </dependency>
 
         <!-- IT -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-util</artifactId>
+            <version>${sal.common.util.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-netconf-connector</artifactId>

diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml
index 9e4b9b59331f36bd0c6553234436f428ef104329..a4c5f07de0b119b85bd3bd89d7348eb7c5825e4c 100644 (file)
--- a/samples/learning-switch/pom.xml
+++ b/samples/learning-switch/pom.xml
@@ -53,7 +53,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>0.6.1</version>
         </dependency>
         <dependency>
           <groupId>org.osgi</groupId>

diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml
index 9ffbb56470c85c70f347f5d8cbdd5e52fa75db6c..05863a7a4b96b76d2117359a57e0e14593a413de 100644 (file)
--- a/samples/sample-consumer/pom.xml
+++ b/samples/sample-consumer/pom.xml
@@ -12,11 +12,6 @@
     <version>0.0.3-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <properties>
-        <yang.prototype.version>1.0</yang.prototype.version>
-    </properties>
-
-
     <build>
         <plugins>
             <plugin>
@@ -62,7 +57,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>0.6.1</version>
         </dependency>
         <dependency>
           <groupId>org.osgi</groupId>
@@ -76,7 +70,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${yang.prototype.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>