From 9251b02f242ff6abe00fee9086a2fcd5fea3b207 Mon Sep 17 00:00:00 2001
From: Tom Pantelis <tompantelis@gmail.com>
Date: Fri, 16 Jun 2017 22:41:40 -0400
Subject: [PATCH] Switch from config-parent in pom files

Most netconf bundles don't or no longer use the CSS so they
don't need to use config-parent.

Change-Id: I59757e8e81709f4904615b0e3829bc5ef569000b
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
---
 netconf/aaa-authn-odl-plugin/pom.xml       |  6 +++---
 netconf/mdsal-netconf-connector/pom.xml    |  6 +++---
 netconf/mdsal-netconf-impl/pom.xml         |  6 +++---
 netconf/mdsal-netconf-monitoring/pom.xml   |  6 +++---
 netconf/mdsal-netconf-notification/pom.xml |  6 +++---
 netconf/mdsal-netconf-ssh/pom.xml          |  6 +++---
 netconf/mdsal-netconf-yang-library/pom.xml | 12 ++++++++----
 netconf/messagebus-netconf/pom.xml         |  6 +++---
 netconf/netconf-console/pom.xml            | 19 +++++++++++++++----
 netconf/netconf-impl/pom.xml               |  6 +++---
 netconf/netconf-notifications-impl/pom.xml |  6 +++---
 netconf/netconf-ssh/pom.xml                |  6 +++---
 netconf/netconf-tcp/pom.xml                |  6 +++---
 netconf/netconf-topology-singleton/pom.xml |  6 +++---
 netconf/netconf-topology/pom.xml           |  6 +++---
 15 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index 115e048ff8..c2c7efaf56 100644
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/netconf/aaa-authn-odl-plugin/pom.xml
@@ -10,9 +10,9 @@
     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.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 839c6549d1..ae6befdaa8 100644
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml
index 5e7ae94d19..6b4380ec57 100644
--- a/netconf/mdsal-netconf-impl/pom.xml
+++ b/netconf/mdsal-netconf-impl/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 5bc776a946..6d2d24d6de 100644
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -9,9 +9,9 @@
 <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.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index b616011db1..6316778921 100644
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -9,9 +9,9 @@
 <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.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/mdsal-netconf-ssh/pom.xml b/netconf/mdsal-netconf-ssh/pom.xml
index be4172a5bb..ceb73a582c 100644
--- a/netconf/mdsal-netconf-ssh/pom.xml
+++ b/netconf/mdsal-netconf-ssh/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml
index 145481a1ea..7d7ccc3bc2 100644
--- a/netconf/mdsal-netconf-yang-library/pom.xml
+++ b/netconf/mdsal-netconf-yang-library/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
@@ -39,6 +39,10 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-core-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types-2013-07-15</artifactId>
@@ -82,4 +86,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index b38ee885e4..2ec5df53cc 100644
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -12,9 +12,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index 19bcb1aedd..e5fe821587 100644
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
@@ -21,6 +21,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.netconf</groupId>
+        <artifactId>netconf-subsystem</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
       <!-- Apache Karaf console dependency -->
       <dependency>
@@ -40,7 +52,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <dependency>
           <groupId>org.opendaylight.netconf</groupId>
           <artifactId>sal-netconf-connector</artifactId>
-          <version>${mdsal.version}</version>
       </dependency>
       <dependency>
           <groupId>org.mockito</groupId>
diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index dde977b82a..1637a9b97f 100644
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml
index 5d4a84d643..4968a4a61f 100644
--- a/netconf/netconf-notifications-impl/pom.xml
+++ b/netconf/netconf-notifications-impl/pom.xml
@@ -12,9 +12,9 @@
          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.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml
index 66f87fb699..fea44e9626 100644
--- a/netconf/netconf-ssh/pom.xml
+++ b/netconf/netconf-ssh/pom.xml
@@ -9,9 +9,9 @@
 <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.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml
index 9466d17e30..7693a93d99 100644
--- a/netconf/netconf-tcp/pom.xml
+++ b/netconf/netconf-tcp/pom.xml
@@ -10,9 +10,9 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index c4c540092c..d0397d8463 100644
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -12,9 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index 21e9b36108..9ebd249206 100644
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -4,9 +4,9 @@
          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.controller</groupId>
-        <artifactId>config-parent</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>bundle-parent</artifactId>
+        <version>1.9.0</version>
         <relativePath/>
     </parent>
 
-- 
2.36.6