From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 6 May 2019 16:12:41 +0000 (+0200)
Subject: Split out odl-controller-dom-api
X-Git-Tag: release/sodium~100
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9978b071e402331d64bc0e8687e4190d0840b6ed

Split out odl-controller-dom-api

This refactors packaging so that we package DOM-level APIs
in a corresponding feature -- mirroring MD-SAL's setup. We also fix
dependencies on MD-SAL features to use ranges instead of fixed
versions.

JIRA: CONTROLLER-1584
Change-Id: Ib5e0649552b34662a91b4fb32da9af69f589bb6b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 3ea5dadbed..18dd30fa00 100644
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -32,6 +32,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -43,8 +50,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-guava</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-dom-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/config-netty/odl-config-netty/src/main/feature/feature.xml b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
index 931e6991f0..052097b5d7 100644
--- a/features/config-netty/odl-config-netty/src/main/feature/feature.xml
+++ b/features/config-netty/odl-config-netty/src/main/feature/feature.xml
@@ -8,7 +8,6 @@
  -->
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-config-netty">
     <feature name="odl-config-netty">
-        <feature version="[5,6)">odl-guava</feature>
         <feature version="[5,6)">odl-netty-4</feature>
     </feature>
 </features>
diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index 99faee1c6f..5a1bbfbdc4 100644
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -71,6 +71,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-controller-dom-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-mdsal-distributed-datastore</artifactId>
diff --git a/features/mdsal/odl-controller-dom-api/pom.xml b/features/mdsal/odl-controller-dom-api/pom.xml
new file mode 100644
index 0000000000..2f5b95d252
--- /dev/null
+++ b/features/mdsal/odl-controller-dom-api/pom.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2019 PANTHEON.tech, s.r.o. and others.
+
+ 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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>5.0.0</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>odl-controller-dom-api</artifactId>
+    <version>1.10.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Controller :: DOM API and SPI</name>
+    <description>Controller DOM APIs</description>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>4.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-dom-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-mdsal-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-core-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-core-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-core-compat</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
new file mode 100644
index 0000000000..f3f8161fca
--- /dev/null
+++ b/features/mdsal/odl-controller-dom-api/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2019 PANTHEON.tech, s.r.o. and others.
+
+ 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
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-dom-api-${project.version}">
+    <feature name="odl-controller-dom-api" version="${project.version}">
+        <feature version="[4,5)">odl-mdsal-dom-api</feature>
+    </feature>
+</features>
diff --git a/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
new file mode 100644
index 0000000000..b01808ce93
--- /dev/null
+++ b/features/mdsal/odl-controller-mdsal-common/src/main/feature/feature.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2019 PANTHEON.tech, s.r.o. and others.
+
+ 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
+ -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-controller-mdsal-common-${project.version}">
+    <feature name="odl-controller-mdsal-common" version="${project.version}">
+        <feature version="[4,5)">odl-mdsal-common</feature>
+        <feature version="[4,5)">odl-mdsal-binding-runtime</feature>
+    </feature>
+</features>
diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 14e06c7e22..af41046c11 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -113,14 +113,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sal-core-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-broker-impl</artifactId>
diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index cec66b3290..9234d3e472 100644
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -25,6 +25,7 @@
         <module>features-mdsal</module>
         <module>odl-clustering-test-app</module>
         <module>odl-controller-mdsal-common</module>
+        <module>odl-controller-dom-api</module>
         <module>odl-mdsal-all</module>
         <module>odl-mdsal-broker</module>
         <module>odl-mdsal-broker-local</module>
diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 972cab3f38..5f42ff3531 100644
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -349,6 +349,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-dom-api</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-distributed-datastore</artifactId>