From 20a5c3b52cf86d1693aae6274dd4444e25b690c0 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Wed, 20 Feb 2019 16:45:13 +0100
Subject: [PATCH] Rationalize poms

- remove mdsal binding models + ietf and iana models versions.
  They are inherited from binding-parent.
- remove useless karaf4 related dependencies.

Change-Id: Ic3ca904175e134597cdc1331eb71c4dca723a6a7
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
---
 features/odl-transportpce-api/pom.xml        | 11 -----------
 features/odl-transportpce-ordmodels/pom.xml  | 11 -----------
 features/odl-transportpce-stubmodels/pom.xml | 10 ----------
 ordmodels/common/pom.xml                     |  1 -
 ordmodels/device/pom.xml                     |  2 --
 ordmodels/network/pom.xml                    |  2 --
 ordmodels/pom.xml                            |  6 ------
 ordmodels/service/pom.xml                    |  2 --
 8 files changed, 45 deletions(-)

diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml
index 6a6e671d9..fe8496b4c 100644
--- a/features/odl-transportpce-api/pom.xml
+++ b/features/odl-transportpce-api/pom.xml
@@ -23,7 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
 
   <properties>
-    <mdsal.bmodel.version>1.2.6</mdsal.bmodel.version>
     <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <yangtools.version>2.1.8</yangtools.version>
@@ -35,16 +34,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <name>OpenDaylight :: transportpce :: api</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>${mdsal.bmodel.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>${mdsal.bmodel.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-transportpce-ordmodels</artifactId>
diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml
index e1c94923d..aa3c65912 100644
--- a/features/odl-transportpce-ordmodels/pom.xml
+++ b/features/odl-transportpce-ordmodels/pom.xml
@@ -22,7 +22,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <packaging>feature</packaging>
 
   <properties>
-    <mdsal.bmodel.version>1.2.6</mdsal.bmodel.version>
     <mdsal.version>1.9.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.9.0-SNAPSHOT</restconf.version>
     <yangtools.version>2.1.8</yangtools.version>
@@ -34,16 +33,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <name>OpenDaylight :: transportpce :: ordmodels</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>${mdsal.bmodel.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>${mdsal.bmodel.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}.ordmodels</groupId>
       <artifactId>transportpce-ordmodels-common</artifactId>
diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml
index d95b2fd75..60a6bd50b 100644
--- a/features/odl-transportpce-stubmodels/pom.xml
+++ b/features/odl-transportpce-stubmodels/pom.xml
@@ -31,16 +31,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <name>OpenDaylight :: transportpce :: stubmodels</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-      <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>odl-transportpce-ordmodels</artifactId>
diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml
index 9a37b49c4..d52a81212 100644
--- a/ordmodels/common/pom.xml
+++ b/ordmodels/common/pom.xml
@@ -37,7 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml
index 0191d2a0d..082e4fd74 100644
--- a/ordmodels/device/pom.xml
+++ b/ordmodels/device/pom.xml
@@ -61,12 +61,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
   </dependencies>
 
diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml
index 5f6a56dfc..6120755cf 100644
--- a/ordmodels/network/pom.xml
+++ b/ordmodels/network/pom.xml
@@ -45,12 +45,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <!--dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml
index fbe9cc62c..5f2a7239d 100644
--- a/ordmodels/pom.xml
+++ b/ordmodels/pom.xml
@@ -104,12 +104,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -120,7 +118,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-access-control-list</artifactId>
-      <version>0.13.6</version>
     </dependency>
     <!--dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
@@ -135,17 +132,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.iana</groupId>
       <artifactId>iana-if-type</artifactId>
-      <version>1.0.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc7223</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-packet-fields</artifactId>
-      <version>0.13.6</version>
     </dependency>
   </dependencies>
 
diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml
index 626851697..71bd23ed2 100644
--- a/ordmodels/service/pom.xml
+++ b/ordmodels/service/pom.xml
@@ -45,12 +45,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-inet-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
       <artifactId>rfc6991-ietf-yang-types</artifactId>
-      <version>1.2.6</version>
     </dependency>
   </dependencies>
 </project>
-- 
2.36.6