Depend on minimal models

OFP does not need all the mdsal models, pull in only the models
we need.

JIRA: MDSAL-363
Change-Id: I7de07b123a861b3ff706c38eddbc72c1355c48d6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 11b2079596506c67ae197b1cd6f20999401fdc2a..23cc2d7665c186493bc5469d6baedfde700e4331 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -15,18 +15,22 @@
 
     <name>OpenDaylight :: OpenflowPlugin :: NSF :: Model</name>
 
-    <properties>
-        <mdsal.version>1.8.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
+            <!-- MD-SAL models -->
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
             <!-- Controller infrastructure -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>${mdsal.version}</version>
+                <version>1.8.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -37,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>
@@ -46,7 +49,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-model-inventory</artifactId>
-            <version>${mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
@@ -54,7 +56,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-model-topology</artifactId>
-            <version>${mdsal.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 554e00cc6253ebefd5d23844e03b2e1ff649fcaa..b10d94dc71c590a9553dfe6f97e1c09d24575dd1 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -18,12 +18,6 @@
          build failure. Please do not modify this unless you have a good reason. -->
     <name>ODL :: openflowjava :: ${project.artifactId}</name>
 
-    <properties>
-        <mdsal.version>2.5.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.13.0-SNAPSHOT</mdsal.model.version>
-    </properties>
-
-
     <dependencyManagement>
         <dependencies>
             <!-- This project -->
@@ -45,18 +39,10 @@
             </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>
+                <version>0.13.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -65,15 +51,9 @@
 
 
     <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>