X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=4c1a5e6bdb3af74bdfdf44871188bf6dfb35d14a;hb=9bb79c6878859fe9205d292838a0b4e53fe12707;hp=bca0797ab26ba14d013470ea60b2adb050a123a5;hpb=54e78b389d59ff02cf828edea582d7bc903a5e4b;p=openflowjava.git

diff --git a/pom.xml b/pom.xml
index bca0797a..4c1a5e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,21 +2,22 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.openflowjava</groupId>
     <artifactId>openflow-protocol-parent</artifactId>
-    <version>0.3</version>
+    <version>0.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>openflow-protocol-api</module>
         <module>openflow-protocol-spi</module>
         <module>openflow-protocol-impl</module>
         <module>openflow-protocol-it</module>
+        <module>feature</module>
         <module>simple-client</module>
     </modules>
     <scm>
         <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>
-      <tag>openflow-protocol-parent-0.3</tag>
-  </scm>
+      <tag>HEAD</tag>
+    </scm>
 
     <properties>
         <sonar.host.url>https://sonar.opendaylight.org/</sonar.host.url>
@@ -34,14 +35,20 @@
         <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>
+        <yang.ext.version>2013.09.07.4-SNAPSHOT</yang.ext.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>
+        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
+        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
+        <config.version>0.2.5-SNAPSHOT</config.version>
     </properties>
 
     <pluginRepositories>
+        <!-- Opendaylight public group -->
         <pluginRepository>
             <id>odlPublic</id>
             <name>odlPublic</name>
@@ -50,13 +57,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 +78,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,28 +109,59 @@
 
     <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>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-buffer</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-handler</artifactId>
                 <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.opendaylight.yangtools.model</groupId>
+                <artifactId>yang-ext</artifactId>
+                <version>${yang.ext.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.core</artifactId>
+                <version>5.0.0</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 +188,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>
@@ -214,6 +223,16 @@
                     <artifactId>maven-release-plugin</artifactId>
                     <version>${releaseplugin.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>yang-maven-plugin</artifactId>
+                    <version>${yangtools.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>${maven.bundle.version}</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>