Migration to use MD-SAL Project

Change-Id: Ia5400e825301ab62ee9ce23b6724023b060baf19
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/nemo-api/pom.xml b/nemo-api/pom.xml
index 68ef1667f5fb56c0d822227da191a919f95f3ed3..83403f336f623f5989b7c749cd71aba1380a695d 100644 (file)
--- a/nemo-api/pom.xml
+++ b/nemo-api/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.yangtools</groupId>
+    <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <relativePath />
@@ -50,7 +50,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </executions>
         <dependencies>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>

diff --git a/nemo-features/pom.xml b/nemo-features/pom.xml
index 57443eeba6a6bae5480dfb0c2e1082e3ade1258b..c678d52d728e73c007418d0c16c59e1587b1f022 100644 (file)
--- a/nemo-features/pom.xml
+++ b/nemo-features/pom.xml
@@ -26,18 +26,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </prerequisites>
 
   <properties>
-    <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
+    <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-    <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
     <dlux.version>0.3.0-SNAPSHOT</dlux.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.mdsal.model</groupId>
+        <artifactId>mdsal-model-artifacts</artifactId>
+        <version>${mdsal.model.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${controller.mdsal.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -60,9 +67,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.yangtools</groupId>
-      <artifactId>features-yangtools</artifactId>
-      <version>${yangtools.version}</version>
+      <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>

diff --git a/nemo-features/src/main/features/features.xml b/nemo-features/src/main/features/features.xml
index 3c9e417b890f228feba1cea4179c476574b1b461..4cec8905e615c4da65160c4a60b8e03b2165d166 100644 (file)
--- a/nemo-features/src/main/features/features.xml
+++ b/nemo-features/src/main/features/features.xml
@@ -8,23 +8,23 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <features name="odl-nemo-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"\r
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">\r
-  <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>\r
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>\r
+  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features</repository>\r
+  <repository>mvn:org.opendaylight.controller/features-mdsal/${controller.mdsal.version}/xml/features</repository>\r
   <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>\r
   <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>\r
   <feature name='odl-nemo-api' version='${project.version}' description='OpenDaylight :: NEMO :: API'>\r
-    <feature version='${yangtools.version}'>odl-yangtools-models</feature>\r
+    <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>\r
     <bundle>mvn:org.opendaylight.nemo/nemo-api/${project.version}</bundle>\r
   </feature>\r
   <feature name='odl-nemo-engine' version='${project.version}' description='OpenDaylight :: NEMO :: Engine'>\r
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>\r
+    <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>\r
     <feature version='${project.version}'>odl-nemo-api</feature>\r
     <bundle>mvn:org.opendaylight.nemo/nemo-impl/${project.version}</bundle>\r
   </feature>\r
   <feature name='odl-nemo-engine-rest' version='${project.version}' description='OpenDaylight :: NEMO :: Engine :: REST'>\r
     <feature version='${restconf.version}'>odl-restconf</feature>\r
     <feature version='${restconf.version}'>odl-mdsal-apidocs</feature>\r
-    <feature version='${mdsal.version}'>odl-mdsal-xsql</feature>\r
+    <feature version='${controller.mdsal.version}'>odl-mdsal-xsql</feature>\r
     <feature version='${project.version}'>odl-nemo-engine</feature>\r
   </feature>\r
   <feature name='odl-nemo-openflow-renderer' version='${project.version}' description='OpenDaylight :: NEMO :: OpenFlow Renderer'>\r
@@ -37,4 +37,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${project.version}'>odl-nemo-engine-rest</feature>\r
     <bundle>mvn:org.opendaylight.nemo/nemo-ui/${project.version}</bundle>\r
   </feature>\r
-</features>
\ No newline at end of file
+</features>\r

diff --git a/nemo-impl/pom.xml b/nemo-impl/pom.xml
index a363555d242aa86712e27119bb64c173dae1ca47..fdb81457a0f81c389ca40a9498c2a4c51ec41add 100644 (file)
--- a/nemo-impl/pom.xml
+++ b/nemo-impl/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <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/nemo-renderers/openflow-renderer/pom.xml b/nemo-renderers/openflow-renderer/pom.xml
index 277aa67b782a58c84f9562f69abf0550bd98783f..a88e190b4ed7f3860ae8ce1816951121b55c7398 100644 (file)
--- a/nemo-renderers/openflow-renderer/pom.xml
+++ b/nemo-renderers/openflow-renderer/pom.xml
@@ -89,7 +89,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </executions>
         <dependencies>
           <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
+            <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>maven-sal-api-gen-plugin</artifactId>
             <version>${yangtools.version}</version>
             <type>jar</type>

diff --git a/nemo-renderers/pom.xml b/nemo-renderers/pom.xml
index 1024502239b6d9a1aa0d5e2247dc9e132159bcb4..7066dda6e59e0ec5a9fa4411f607cd8863cc97d2 100644 (file)
--- a/nemo-renderers/pom.xml
+++ b/nemo-renderers/pom.xml
@@ -5,8 +5,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 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">
+<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>
@@ -28,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/nemo.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/nemo.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/NEMO:Main</url>
     <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/NEMO:Main</url>
   </scm>
-</project>
\ No newline at end of file
+</project>

diff --git a/nemo-ui/pom.xml b/nemo-ui/pom.xml
index b77c89ce6aa4ee28c321f3cf7941099d6f4bc9b7..32a0e768fb8835eb7c196cbaf5ec85569c43f791 100644 (file)
--- a/nemo-ui/pom.xml
+++ b/nemo-ui/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <modelVersion>4.0.0</modelVersion>
 
   <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/pom.xml b/pom.xml
index 5403f3663a22ade5b3401cafcc01249b3858f7d7..22b85c9ddaaaebff8936988df60d3782d1b45ffa 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,15 +5,14 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 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">
+<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>releasepom</artifactId>
     <version>0.3.0-SNAPSHOT</version>
-    <relativePath />
+    <relativePath></relativePath>
   </parent>
 
   <groupId>org.opendaylight.nemo</groupId>
@@ -59,7 +58,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <scm>
     <connection>scm:git:ssh://git.opendaylight.org:29418/nemo.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/nemo.git</developerConnection>
-    <url>https://wiki.opendaylight.org/view/NEMO:Main</url>
     <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/NEMO:Main</url>
   </scm>
-</project>
\ No newline at end of file
+</project>