Remove derivation from controller config-parent

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

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

diff --git a/alivenessmonitor/alivenessmonitor-api/pom.xml b/alivenessmonitor/alivenessmonitor-api/pom.xml
index b8555dc0af846a3005cb78c5b6b547a0646ed35d..11db66650806991290e04b0e64cdc1bacfa95294 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-api/pom.xml
+++ b/alivenessmonitor/alivenessmonitor-api/pom.xml
@@ -43,6 +43,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-inet-types-2013-07-15</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>ietf-yang-types-20130715</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

diff --git a/arputil/arputil-api/src/main/yang/odl-arputil.yang b/arputil/arputil-api/src/main/yang/odl-arputil.yang
index 1fc27483dcefbc1397e1bdd5bdab2f526452c198..2d60fd373c43ea418cff9dd5a986a10db67edaf2 100644 (file)
--- a/arputil/arputil-api/src/main/yang/odl-arputil.yang
+++ b/arputil/arputil-api/src/main/yang/odl-arputil.yang
@@ -19,15 +19,10 @@ module odl-arputil {
         prefix inv; revision-date 2013-08-19;
     }
 
-    import config {
-        prefix config; revision-date 2013-04-05;
-    }
-
     revision "2016-04-06" {
         description "Arp Util module";
     }
 
-
     grouping interfaces {
         list interface-address {
            key interface;

diff --git a/arputil/arputil-impl/pom.xml b/arputil/arputil-impl/pom.xml
index 19c0bf6c529181a9fe58618fc602737381c14c94..98e989344f3460634ee3e2ac2a000c0a53201316 100644 (file)
--- a/arputil/arputil-impl/pom.xml
+++ b/arputil/arputil-impl/pom.xml
@@ -107,7 +107,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

diff --git a/commons/config-parent/pom.xml b/commons/config-parent/pom.xml
index 9fb4203d95bff8301f723838887185d87f1f6553..71dee77f1006f06eb5478cb5fc461286a1c7ad61 100644 (file)
--- a/commons/config-parent/pom.xml
+++ b/commons/config-parent/pom.xml
@@ -9,9 +9,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <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">
 
   <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>
 
@@ -54,10 +54,29 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>${controller.mdsal.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+
     <!-- Testing Dependencies -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/fcapsapplication/fcapsapplication-impl/pom.xml b/fcapsapplication/fcapsapplication-impl/pom.xml
index 055a7b91abbd846078597ed935dd346b31a7e269..a11359215f7097d20cedb6c15459442b2f92f247 100644 (file)
--- a/fcapsapplication/fcapsapplication-impl/pom.xml
+++ b/fcapsapplication/fcapsapplication-impl/pom.xml
@@ -29,18 +29,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-config</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>fcapsapplication-jmxapi</artifactId>

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 6f3371af8a1b4f3ff673442a41369ec5c5c37281..7445cde5b6d42f6d03fcd1235144dcaef3e37799 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -73,7 +73,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
-      <version>${mdsal.version}</version>
+      <version>${controller.mdsal.version}</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>