Remove derivation from controller config-parent

aaa does not use the config subsystem so does not need to
derive from controller config-parent.

Change-Id: Ieab26416badc9c4a8b3871ab2edc8276f8cc7847
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
index 06f0782bd4bb5cf141816a9b6f89a9450cd1f240..b8c7ed045eee91a94a435c8bc59d54496408d3ff 100644 (file)
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-store-impl/pom.xml
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-store-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.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -26,6 +26,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>aaa-parent</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
@@ -37,10 +44,6 @@
   </dependencyManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-authn-api</artifactId>

diff --git a/aaa-cert/pom.xml b/aaa-cert/pom.xml
index b14101e5d22e4f19ffda5c510b1ade9623731edb..527e0f0f7cec46a01238f42453cab5bdebad4f03 100644 (file)
--- a/aaa-cert/pom.xml
+++ b/aaa-cert/pom.xml
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <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>
 
@@ -35,10 +35,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </dependencyManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>aaa-encrypt-service</artifactId>

diff --git a/aaa-cert/src/main/yang/aaa-cert-mdsal.yang b/aaa-cert/src/main/yang/aaa-cert-mdsal.yang
index f5c87c52536884e2b2eee0f2250ac09821010a6e..28753e2507c8b19e68c6f99d21d1319b1b72e7f2 100644 (file)
--- a/aaa-cert/src/main/yang/aaa-cert-mdsal.yang
+++ b/aaa-cert/src/main/yang/aaa-cert-mdsal.yang
@@ -10,16 +10,6 @@ module aaa-cert-mdsal {
     namespace "urn:opendaylight:yang:aaa:cert:mdsal";
     prefix "aaa-cert-mdsal";
 
-    import config {
-        prefix config;
-        revision-date 2013-04-05;
-    }
-
-    import opendaylight-md-sal-binding {
-        prefix md-sal-binding;
-        revision-date 2013-10-28;
-    }
-
     revision 2016-03-21 {
         description "Initial revision";
     }
@@ -124,4 +114,4 @@ module aaa-cert-mdsal {
             uses ssl-data;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/aaa-cli/pom.xml b/aaa-cli/pom.xml
index ac0c646b6ae733f36fd7f0766c6ba6fbb0d1ec34..741402010aa32cb9aca2e6e28db8e1a94acc0f12 100644 (file)
--- a/aaa-cli/pom.xml
+++ b/aaa-cli/pom.xml
@@ -10,9 +10,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <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>2.0.2</version>
     <relativePath />
   </parent>
 

diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml
index 2b2e54f46c926cb96df88f5a3ac3ff09d92f33e5..9d8b390d79671fc796efe19b282952b07631490e 100644 (file)
--- a/aaa-encrypt-service/pom.xml
+++ b/aaa-encrypt-service/pom.xml
@@ -3,9 +3,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.mdsal</groupId>
+    <artifactId>binding-parent</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -15,17 +15,20 @@
   <name>ODL :: aaa :: ${project.artifactId}</name>
   <packaging>bundle</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>aaa-parent</artifactId>
+        <version>${project.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
         <!--Yang Binding -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-      <version>${config.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
@@ -42,6 +45,10 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
     </dependency>
         <!-- Testing Dependencies -->
     <dependency>

diff --git a/aaa-idmlight/pom.xml b/aaa-idmlight/pom.xml
index fb787fedfaf000c6ba509868b527a8e385f4cbd6..d08a4b66a2f463650f5d3f1e0e98467a9edffbb8 100644 (file)
--- a/aaa-idmlight/pom.xml
+++ b/aaa-idmlight/pom.xml
@@ -15,15 +15,6 @@
 
   <dependencies>
     <!--Yang Binding -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-      <version>${config.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>

diff --git a/aaa-shiro-act/impl/pom.xml b/aaa-shiro-act/impl/pom.xml
index 07d10d2cd1f4068d9d517c309a8c56ff27ec7079..a3ecc8d5e5582753525674ae90a1a0ea9f75c731 100644 (file)
--- a/aaa-shiro-act/impl/pom.xml
+++ b/aaa-shiro-act/impl/pom.xml
@@ -11,9 +11,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>2.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/impl/pom.xml b/aaa-shiro/impl/pom.xml
index 8bcb22cd7a91eac16e338d4871168464047bf0a3..e0a95fac371c367f049dbff4a2bedc56e3409489 100644 (file)
--- a/aaa-shiro/impl/pom.xml
+++ b/aaa-shiro/impl/pom.xml
@@ -11,9 +11,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>2.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 734a163b2ecb97e09a25ce587a631f5ad01cac76..29688ac5da1a68ed6202bb5131356675f9a0b9b4 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,13 +89,6 @@
         <scope>import</scope>
         <type>pom</type>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>${config.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
 
       <!-- Third-party -->
       <dependency>