X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=46586086581397e5d6e29025a4fb2a809c1239f9;hb=5aa366c9b02701c5e65aea0fb335dca8cd99d7d9;hp=ce752b344533fdf61b16358cbab4e3631c47b1cf;hpb=a285fbfa6aa4c3f8f3a41fbaf7f2a3fe170f31c1;p=openflowplugin.git

diff --git a/pom.xml b/pom.xml
index ce752b3445..4658608658 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,9 +45,12 @@
     <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>
       <controller.model.version>1.2.0-SNAPSHOT</controller.model.version>
+      <sal.binding.api.version>1.2.0-SNAPSHOT</sal.binding.api.version>
       <sal.api.version>0.9.0-SNAPSHOT</sal.api.version>
       <sal.connection.api.version>0.2.0-SNAPSHOT</sal.connection.api.version>
       <sal.common.util.version>1.2.0-SNAPSHOT</sal.common.util.version>
@@ -58,6 +61,7 @@
       <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
       <exi.nagasena.version>0000.0002.0038.0</exi.nagasena.version>
       <controller.distribution.version>0.2.0-SNAPSHOT</controller.distribution.version>
+      <features.test.version>1.5.0-SNAPSHOT</features.test.version>
 
       <!-- Sonar config -->
       <sonar-jacoco-listeners.version>2.4</sonar-jacoco-listeners.version>
@@ -79,46 +83,18 @@
 
     <dependencyManagement>
       <dependencies>
-         <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <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>
-        <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>
-            <artifactId>yang-ext</artifactId>
-            <version>${yang-ext.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>opendaylight-l2-types</artifactId>
-            <version>${opendaylight-l2-types.version}</version>
+          <groupId>org.opendaylight.yangtools</groupId>
+          <artifactId>yangtools-artifacts</artifactId>
+          <version>${yangtools.version}</version>
+          <scope>import</scope>
+          <type>pom</type>
         </dependency>
 
-          <dependency>
-              <groupId>org.opendaylight.openflowplugin</groupId>
-              <artifactId>openflowplugin-api</artifactId>
-              <version>${project.version}</version>
-          </dependency>
         <dependency>
-          <groupId>org.opendaylight.openflowjava</groupId>
-          <artifactId>openflow-protocol-impl</artifactId>
-          <version>${openflowjava.version}</version>
+          <groupId>org.opendaylight.openflowplugin</groupId>
+          <artifactId>openflowplugin-api</artifactId>
+          <version>${project.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.openflowjava</groupId>
@@ -140,21 +116,23 @@
           <artifactId>simple-client</artifactId>
           <version>${openflowjava.version}</version>
         </dependency>
+
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-base</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-service</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.opendaylight.controller.model</groupId>
+          <groupId>org.opendaylight.openflowplugin.model</groupId>
           <artifactId>model-flow-statistics</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${openflowplugin.model.version}</version>
         </dependency>
+
         <dependency>
           <groupId>org.opendaylight.controller.model</groupId>
           <artifactId>model-inventory</artifactId>
@@ -169,12 +147,12 @@
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-api</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>sal-binding-config</artifactId>
-          <version>${controller.model.version}</version>
+          <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -187,17 +165,12 @@
             <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-common-util</artifactId>
-            <version>${controller.model.version}</version>
-        </dependency>
-        <!-- IT -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
             <version>${sal.common.util.version}</version>
         </dependency>
+        <!-- IT -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-netconf-connector</artifactId>
@@ -206,27 +179,39 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-it</artifactId>
-            <version>${controller.model.version}</version>
+            <version>${sal.binding.api.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${controller.model.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>sal-binding-broker-impl</artifactId>
+          <version>${sal.binding.api.version}</version>
+
+          <!-- excluding old models pulled as transient dependencies
+               TODO: remove -->
+          <exclusions>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-base</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-service</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.opendaylight.controller.model</groupId>
+              <artifactId>model-flow-statistics</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <version>${config.parent.version}</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-manager</artifactId>
+          <version>${config.parent.version}</version>
         </dependency>
-          <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>config-api</artifactId>
-              <version>${config.parent.version}</version>
-          </dependency>
         <dependency>
-            <groupId>org.opendaylight.yangtools.thirdparty</groupId>
-            <artifactId>antlr4-runtime-osgi-nohead</artifactId>
-            <version>4.0</version>
+          <groupId>org.opendaylight.controller</groupId>
+          <artifactId>config-api</artifactId>
+          <version>${config.parent.version}</version>
         </dependency>
         <dependency>
           <groupId>org.opendaylight.controller</groupId>
@@ -264,6 +249,12 @@
           <version>${netconf.parent.version}</version>
         </dependency>
 
+        <dependency>
+          <groupId>org.opendaylight.odlparent</groupId>
+          <artifactId>features-test</artifactId>
+          <version>${features.test.version}</version>
+        </dependency>
+
         <!-- thirdparty -->
         <dependency>
           <groupId>org.openexi</groupId>
@@ -347,11 +338,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>
@@ -608,132 +594,13 @@
           </plugins>
         </reporting>
       </profile>
-
-      <profile>
-        <id>nsf-migration</id>
-        <activation>
-          <activeByDefault>false</activeByDefault>
-          <file>
-            <exists>${basedir}/migrationStep.1</exists>
-          </file>
-        </activation>
-
-        <properties>
-          <!-- TODO: pull out into parent -->
-          <openflowplugin.model.version>${project.version}</openflowplugin.model.version>
-        </properties>
-
-        <dependencyManagement>
-          <!-- TODO: pull out into parent -->
-          <dependencies>
-            <dependency>
-              <groupId>org.opendaylight.openflowplugin.model</groupId>
-              <artifactId>model-flow-base</artifactId>
-              <version>${openflowplugin.model.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.openflowplugin.model</groupId>
-              <artifactId>model-flow-service</artifactId>
-              <version>${openflowplugin.model.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.openflowplugin.model</groupId>
-              <artifactId>model-flow-statistics</artifactId>
-              <version>${openflowplugin.model.version}</version>
-            </dependency>
-
-            <!-- excluding old models pulled as transient dependencies 
-                 TODO: remove -->
-            <dependency>
-              <groupId>org.opendaylight.openflowplugin</groupId>
-              <artifactId>openflowplugin-api</artifactId>
-              <version>${project.version}</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-base</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-service</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-statistics</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.controller</groupId>
-              <artifactId>sal-binding-broker-impl</artifactId>
-              <version>${controller.model.version}</version>
-              <exclusions>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-base</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-service</artifactId>
-                </exclusion>
-                <exclusion>
-                  <groupId>org.opendaylight.controller.model</groupId>
-                  <artifactId>model-flow-statistics</artifactId>
-                </exclusion>
-              </exclusions>
-            </dependency>
-          </dependencies>
-
-        </dependencyManagement>
-      </profile>
-
     </profiles>
 
-    <repositories>
-      <repository>
-        <id>opendaylight-snapshot</id>
-        <name>opendaylight-snapshot</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </repository>
-      <repository>
-        <id>public</id>
-        <name>public</name>
-        <url>http://nexus.opendaylight.org/content/groups/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </repository>
-
-    </repositories>
-
-    <pluginRepositories>
-      <pluginRepository>
-        <id>opendaylight-central</id>
-        <name>opendaylight-central</name>
-        <url>http://nexus.opendaylight.org/content/repositories/public</url>
-        <snapshots>
-          <enabled>false</enabled>
-        </snapshots>
-      </pluginRepository>
-      <pluginRepository>
-        <id>opendaylight-snapshot</id>
-        <name>central2</name>
-        <url>http://nexus.opendaylight.org/content/repositories/opendaylight.snapshot</url>
-        <releases>
-          <enabled>false</enabled>
-        </releases>
-      </pluginRepository>
-    </pluginRepositories>
-
     <modules>
       <module>openflowplugin-api</module>
       <module>openflowplugin</module>
+      <module>openflowplugin-impl</module>
       <module>extension</module>
-      <module>distribution/base</module>
-      <module>distribution/cbench</module>
       <module>distribution/karaf</module>
       <module>openflowplugin-controller-config</module>
       <module>openflowplugin-it</module>
@@ -746,6 +613,6 @@
       <module>samples/learning-switch</module>
       <module>applications</module>
       <module>model</module>
-      <module>legacy</module>  
+      <module>legacy</module>
   </modules>
 </project>