Updated openflowjava versions for stable branch

Fixed Bug 750 - removed duplicate release repository

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

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index fd501e1d390f42dbf2712d383b0d1589ee5dd354..3cb45dfaf4144a671a01225662df33408d6fa0c8 100644 (file)
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>openflow-protocol-api</artifactId>
     <packaging>bundle</packaging>
@@ -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 6908224a53ea2a8c9f93986b6ceee3d737f1edb8..e897f83129279f444099750f9f5f34344d452495 100644 (file)
--- a/openflow-protocol-impl/pom.xml
+++ b/openflow-protocol-impl/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>openflow-protocol-impl</artifactId>
     <packaging>bundle</packaging>
@@ -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/openflow-protocol-it/pom.xml b/openflow-protocol-it/pom.xml
index 6d244b67fd79eeda896a677624f7295c79ca771e..6cef615ca73539f10021c6ed10e112f207f708eb 100644 (file)
--- a/openflow-protocol-it/pom.xml
+++ b/openflow-protocol-it/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>openflow-protocol-it</artifactId>
     <packaging>bundle</packaging>

diff --git a/openflow-protocol-spi/pom.xml b/openflow-protocol-spi/pom.xml
index bc08690377a1ebf3787ad84470b7ec8a040a759f..2b4e984d43cb856ff06f64ec4a07aacf929819c8 100644 (file)
--- a/openflow-protocol-spi/pom.xml
+++ b/openflow-protocol-spi/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>openflow-protocol-spi</artifactId>
     <packaging>bundle</packaging>

diff --git a/pom.xml b/pom.xml
index b59623fd8dde1f02bf4d8522b49eaf9dcb2569e1..841d03603844cb2edf91ca5b8e34db71e8ee4e78 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.4-SNAPSHOT</version>
+    <version>0.4-1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>openflow-protocol-api</module>
@@ -34,14 +34,16 @@
         <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.17.Final</netty.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
     </properties>
 
     <pluginRepositories>
+        <!-- Opendaylight public group -->
         <pluginRepository>
             <id>odlPublic</id>
             <name>odlPublic</name>
@@ -50,13 +52,6 @@
               <enabled>false</enabled>
             </snapshots>
         </pluginRepository>
-       <pluginRepository>
-            <id>opendaylight-release</id>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
         <!-- OpenDayLight Snapshot artifact -->
         <pluginRepository>
             <id>opendaylight-snapshot</id>
@@ -78,15 +73,6 @@
               <enabled>false</enabled>
             </snapshots>
         </repository>
-        <!-- OpenDayLight Released artifact -->
-        <repository>
-            <id>opendaylight-release</id>
-            <name>opendaylight-release</name>
-            <url>${nexusproxy}/repositories/opendaylight.release/</url>
-            <snapshots>
-              <enabled>false</enabled>
-            </snapshots>
-        </repository>
         <!-- OpenDayLight Snapshot artifact -->
         <repository>
             <id>opendaylight-snapshot</id>
@@ -118,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>
@@ -136,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>

diff --git a/simple-client/pom.xml b/simple-client/pom.xml
index f9dacffc17da2a7c223577260386dddbe45dbfd7..566c1b6b8fe59d0762de5bff1b78a63b590357cf 100644 (file)
--- a/simple-client/pom.xml
+++ b/simple-client/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.4-SNAPSHOT</version>
+        <version>0.4-1-SNAPSHOT</version>
     </parent>
     <artifactId>simple-client</artifactId>
     <packaging>bundle</packaging>