Integrate controller-2.0.1

[openflowplugin.git] / features-aggregator / odl-openflowplugin-nsf-model / pom.xml

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 58c307603d2b817f697032861ca9bd191255a83a..a01508d5ae68fa89ab348aee3b9bcadf84ff4057 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -1,33 +1,36 @@
 <?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>3.0.2</version>
+        <version>7.0.2</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.openflowplugin</groupId>
     <artifactId>odl-openflowplugin-nsf-model</artifactId>
     <packaging>feature</packaging>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
 
     <name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
 
-    <properties>
-        <mdsal.version>1.7.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.12.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
+            <!-- MD-SAL models -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>6.0.1</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <artifactId>controller-artifacts</artifactId>
+                <version>2.0.1</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -38,8 +41,7 @@
         <!-- feature dependencies -->
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
-            <artifactId>odl-mdsal-models</artifactId>
-            <version>${mdsal.model.version}</version>
+            <artifactId>odl-mdsal-model-odl-l2-types</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -47,15 +49,15 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-model-inventory</artifactId>
-            <version>${mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
 
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-topology</artifactId>
-            <version>${mdsal.version}</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-model-topology</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
 
         <dependency>