Bumped to SNAPSHOT dependencies

 - some dependencies moved to <dependencyManagement>
 - also bumped netty version to 4.0.15 Final (as there was a lot of fixes since 4.0.10 Final)

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Change-Id: Ib636921c0dd099b90f451c44d33ab1d00e4455bb

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 2655d244d0a4f30519f7d44497c31796fc2f5345..eb6615a9d5958c3ed2814a3fa57d9f02f188ed68 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -14,9 +14,9 @@
   </scm>
 
     <properties>
-        <yangtools.version>0.6.1</yangtools.version>
-        <yangtools.generator.version>0.6.1</yangtools.generator.version>
-        <yangtools.binding.version>0.6.1</yangtools.binding.version>
+        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
+        <yangtools.binding.version>0.6.2-SNAPSHOT</yangtools.binding.version>
     </properties>
 
     <build>
@@ -132,17 +132,14 @@
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>2010.09.24.3</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>2010.09.24.3</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/openflow-protocol-impl/pom.xml b/openflow-protocol-impl/pom.xml
index 9e07d10202730d762fc6d8c86d00f41f85cc822a..ad813c8c3028dc177218125a27eba39b78e419ae 100644 (file)
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -45,6 +45,16 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
             <version>${yang.prototype.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.opendaylight.controller</groupId>
+                    <artifactId>sal-common-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>concepts</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -53,12 +63,12 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>5.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slf4j.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -72,8 +82,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
 </project>

diff --git a/pom.xml b/pom.xml
index 1c9389589a6c0fd3281c77607bd51361c3a8e139..e07e7c9b91102091024010dee1af340daff26a57 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -34,10 +34,11 @@
         <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
         <logback.version>1.0.9</logback.version>
         <slf4j.version>1.7.2</slf4j.version>
-        <yang.prototype.version>1.0</yang.prototype.version>
+        <yang.prototype.version>1.1-SNAPSHOT</yang.prototype.version>
+        <ietf.model.version>2010.09.24.4-SNAPSHOT</ietf.model.version>
         <maven.bundle.version>2.4.0</maven.bundle.version>
         <guava.version>14.0.1</guava.version> 
-        <netty.version>4.0.10.Final</netty.version>
+        <netty.version>4.0.15.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
     </properties>
 
@@ -103,13 +104,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.10</version>
-                <scope>test</scope>
-                <optional>true</optional>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
@@ -121,10 +115,43 @@
                 <version>${netty.version}</version>
             </dependency>
             <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>${guava.version}</version>
-        </dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-inet-types</artifactId>
+                <version>${ietf.model.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools.model</groupId>
+                <artifactId>ietf-yang-types</artifactId>
+                <version>${ietf.model.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>5.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller.model</groupId>
+                <artifactId>model-flow-service</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.10</version>
+                <scope>test</scope>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-all</artifactId>
+                <version>1.9.5</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>