X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=841d03603844cb2edf91ca5b8e34db71e8ee4e78;hb=refs%2Fchanges%2F07%2F6207%2F1;hp=2bb9114d6322fefbbbc3851f6be1a0b18236d962;hpb=6e5292cdcd9725867f77d4117cc985aa8cd05968;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index 2bb9114d..841d0360 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.1-SNAPSHOT</version>
+    <version>0.4-1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>openflow-protocol-api</module>
@@ -16,7 +15,8 @@
         <connection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/openflowjava.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-    </scm>
+      <tag>HEAD</tag>
+  </scm>
 
     <properties>
         <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
@@ -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-SNAPSHOT</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>
@@ -166,19 +178,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin> 
-                <!-- explicitly define maven-deploy-plugin after other to force exec order -->
-                <artifactId>maven-deploy-plugin</artifactId> 
-                <executions> 
-                    <execution> 
-                        <id>deploy</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals> 
-                    </execution> 
-                </executions> 
-            </plugin> 
             <plugin>
               <groupId>org.apache.felix</groupId>
               <artifactId>maven-bundle-plugin</artifactId>