X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowjava%2Ffeatures-openflowjava-aggregator%2Fodl-openflowjava-protocol%2Fpom.xml;h=f8266ca5a03814901f8c5da1a9d48624fdc6810a;hb=a425274a36f7ea227ba3ec7181ee646b5fa50d40;hp=5f3d22fa4189420be039f498d1bb923e68e8e8dc;hpb=e36866ca78465c15e15faaf1d349b6e504dc9078;p=openflowplugin.git

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 5f3d22fa41..f8266ca5a0 100644
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -1,33 +1,23 @@
 <?xml version="1.0" encoding="UTF-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>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.4</version>
+        <version>6.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowplugin.openflowjava</groupId>
     <artifactId>odl-openflowjava-protocol</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.10.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: openflowjava :: ${project.artifactId}</name>
 
-    <properties>
-        <controller.mdsal.version>1.7.0-SNAPSHOT</controller.mdsal.version>
-        <mdsal.version>2.4.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
-        <odlparent.netty>2.0.4</odlparent.netty>
-    </properties>
-
-
     <dependencyManagement>
         <dependencies>
             <!-- This project -->
@@ -39,37 +29,11 @@
                 <type>pom</type>
             </dependency>
 
-            <!-- Netty -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-netty-4</artifactId>
-                <version>${odlparent.netty}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
             <!-- MD-SAL -->
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${mdsal.model.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-
-            <!-- Controller infrastructure -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${controller.mdsal.version}</version>
+                <version>5.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -78,27 +42,22 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-binding-base</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
+            <artifactId>odl-mdsal-model-rfc6991</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-mdsal-common</artifactId>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-netty-4</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-netty-4</artifactId>
+            <groupId>org.opendaylight.infrautils</groupId>
+            <artifactId>odl-infrautils-diagstatus</artifactId>
+            <version>1.7.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>