BUG-2794: incorporate openflowjava api changes to openflowplugin

[openflowplugin.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 10034e01283c869880a927a2d104b8f27d8327ca..1a8abca45925785e629c5c3f96fa2509962fe1ed 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
     <properties>
       <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
       <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+      <netconf.version>1.2.0-SNAPSHOT</netconf.version>
       <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
       <openflowjava.version>0.6.0-SNAPSHOT</openflowjava.version>
       <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
@@ -87,20 +88,22 @@
             <artifactId>yang-binding</artifactId>
             <version>${yang.binding.version}</version>
         </dependency>
-       <dependency>
-           <groupId>org.opendaylight.yangtools</groupId>
-           <artifactId>yang-common</artifactId>
-            <version>${yang.binding.version}</version>
-       </dependency>
-       <dependency>
-           <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-           <version>${ietf-inet-types.version}</version>
+        <dependency>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yang-common</artifactId>
+          <version>${yang.binding.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-yang-types</artifactId>
-           <version>${ietf-yang-types.version}</version>
+          <groupId>org.opendaylight.yangtools.model</groupId>
+          <artifactId>ietf-inet-types</artifactId>
+          <version>${ietf-inet-types.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.opendaylight.yangtools.model</groupId>
+          <artifactId>ietf-yang-types</artifactId>
+          <version>${ietf-yang-types.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -118,11 +121,6 @@
               <artifactId>openflowplugin-api</artifactId>
               <version>${project.version}</version>
           </dependency>
-        <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-impl</artifactId>
-          <version>${openflowjava.version}</version>
-        </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
           <artifactId>openflow-protocol-api</artifactId>
@@ -213,7 +211,7 @@
           <artifactId>sal-binding-broker-impl</artifactId>
           <version>${sal.binding.api.version}</version>
 
-          <!-- excluding old models pulled as transient dependencies 
+          <!-- excluding old models pulled as transient dependencies
                TODO: remove -->
           <exclusions>
             <exclusion>
@@ -370,11 +368,6 @@
               </configuration>
             </plugin>
             <plugin>
-              <groupId>org.ops4j.pax.exam</groupId>
-              <artifactId>maven-paxexam-plugin</artifactId>
-              <version>1.2.4</version>
-            </plugin>
-          <plugin>
               <artifactId>maven-clean-plugin</artifactId>
               <configuration>
                   <filesets>