X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=3dd522014c413076b99e072bb8ee13ba3d46c9e3;hb=7b582fda2c3d0cbc4f23af870f524b6fa3bc8c55;hp=6a2eaac8db3b5d1ca4267bf033b94962596a73cb;hpb=0d6444f4f65c636f1129ec712ae501e79a7ce6b7;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index 6a2eaac8db..3dd522014c 100644
--- 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>
@@ -208,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>
@@ -365,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>
@@ -631,6 +629,7 @@
     <modules>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
+      <module>openflowplugin-impl</module>
       <module>extension</module>
       <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>