Fixed binding-parent groupId. It was causing build failure

Patch2: Fix library module to use odl-mdsal-models feature rather then deprecated odl-yangtools-models
Patch3: Fix hwvtep southbound module to use odl-mdsal-models feature as well. Also disable hwvtepsouthbound-karaf
 and hwvtepsouthbound-it features. They are causing the build break.

Change-Id: Ia2261af7f21fb4dbff2958a5e3a01283c4c43f23
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml
index 7bd29abdadf2be8afdf7cc6f20f46c16f127a994..c85b1b118821c9e11d671216b2acd0792952fcbf 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-api/pom.xml
@@ -8,7 +8,7 @@ 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.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <relativePath/>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
index b8194e75d701a616bfa67843478d0488b651ddf5..556dcd39620ba3f01b967be76cf2e21b8691cc2d 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/pom.xml
@@ -24,6 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <dlux.version>0.3.0-SNAPSHOT</dlux.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <configfile.directory>etc/opendaylight/karaf</configfile.directory>
   </properties>
   <dependencyManagement>
@@ -55,6 +56,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-restconf</artifactId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml b/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
index 6b1da3f4ffb1df7a17156587e736bda50c70c289..fc4db1ce37d29f3f86a52a3abf166f20aa942386 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/src/main/features/features.xml
@@ -13,9 +13,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
   <feature name='odl-ovsdb-hwvtepsouthbound-api' version='${project.version}' description='OpenDaylight :: hwvtepsouthbound :: api'>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <bundle>mvn:org.opendaylight.ovsdb/hwvtepsouthbound-api/${project.version}</bundle>
   </feature>
   <feature name='odl-ovsdb-hwvtepsouthbound' version='${project.version}' description='OpenDaylight :: hwvtepsouthbound'>

diff --git a/hwvtepsouthbound/pom.xml b/hwvtepsouthbound/pom.xml
index 2c52b74f36daf26f3b19ded7f4e6a918e4d7f726..5ee5ebde84a395060a546a5f75133509cdb596ca 100644 (file)
--- a/hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/pom.xml
@@ -26,10 +26,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <modules>
     <module>hwvtepsouthbound-api</module>
     <module>hwvtepsouthbound-impl</module>
+    <!-- 
     <module>hwvtepsouthbound-karaf</module>
+     -->
     <module>hwvtepsouthbound-features</module>
     <module>hwvtepsouthbound-artifacts</module>
+    <!-- 
     <module>hwvtepsouthbound-it</module>
+     -->
   </modules>
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
   <build>

diff --git a/library/features/pom.xml b/library/features/pom.xml
index 6aa1ac0529daf3a2fd5d859c9ac0aee4f4fdd44b..ef0fa44bbb0c3a796bdd3aa9f911e0678af4b7f5 100644 (file)
--- a/library/features/pom.xml
+++ b/library/features/pom.xml
@@ -21,6 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
@@ -56,6 +57,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>

diff --git a/library/features/src/main/features/features.xml b/library/features/src/main/features/features.xml
index 30dcae47375da9c68546c286ffbba0a691fd4114..c5fa7ed06b2fa2737a3f6c609453d446db09b47d 100644 (file)
--- a/library/features/src/main/features/features.xml
+++ b/library/features/src/main/features/features.xml
@@ -12,11 +12,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
   <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
   <feature name='odl-ovsdb-library' version='${project.version}' description='OpenDaylight :: library'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
     <bundle>mvn:org.opendaylight.ovsdb/library/${project.version}</bundle>
     <!-- Test only (move to another feature) -->
     <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${project.version}</bundle>