Split out odl-controller-binding-api

This refactors packaging so that we package Binding-level APIs
in a corresponding feature -- mirroring MD-SAL's setup.

JIRA: CONTROLLER-1584
Change-Id: I92adc8f14462633a253136d6c37e708a30cc4a37
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 18dd30fa00bc749b40bff66549b2c24af65a7620..4a3043c39e08bc19279c7888696e7afb112f99b7 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -49,6 +49,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-controller-binding-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>

         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-dom-api</artifactId>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-dom-api</artifactId>

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index 5a1bbfbdc4d9cf5d39a3d5cecf2a745fbd9f8b58..a781d69784e600b71ba05ad3629ab4b4c9ab0114 100644 (file)
--- 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>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-controller-binding-api</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>

         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-controller-dom-api</artifactId>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-controller-dom-api</artifactId>

diff --git a/features/mdsal/odl-controller-binding-api/pom.xml b/features/mdsal/odl-controller-binding-api/pom.xml
new file mode 100644 (file)
index 0000000..d6f4647
--- /dev/null
+++ b/features/mdsal/odl-controller-binding-api/pom.xml
@@ -0,0 +1,68 @@
+<?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-binding-api</artifactId>
+    <version>1.10.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Controller :: Binding API</name>
+    <description>Controller Java Binding 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-binding-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-binding-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-binding-util</artifactId>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml b/features/mdsal/odl-controller-binding-api/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..4557829
--- /dev/null
+++ b/features/mdsal/odl-controller-binding-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-binding-api-${project.version}">
+    <feature name="odl-controller-binding-api" version="${project.version}">
+        <feature version="[4,5)">odl-mdsal-binding-api</feature>
+    </feature>
+</features>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 9234d3e472827e77879a58b62d5781043da40a43..56887f74e221bc79e1879e60e19f2619a2107c38 100644 (file)
--- 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>features-mdsal</module>
         <module>odl-clustering-test-app</module>
         <module>odl-controller-mdsal-common</module>

+        <module>odl-controller-binding-api</module>

         <module>odl-controller-dom-api</module>
         <module>odl-mdsal-all</module>
         <module>odl-mdsal-broker</module>
         <module>odl-controller-dom-api</module>
         <module>odl-mdsal-all</module>
         <module>odl-mdsal-broker</module>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/opendaylight/md-sal/mdsal-artifacts/pom.xml
index 5f42ff3531e9f1c6189d990a224d4a0a290d304d..0a220a00ca5275fe1e09d5521178e05ad8bb1dff 100644 (file)
--- 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>
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>

+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-binding-api</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>

             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-controller-dom-api</artifactId>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-controller-dom-api</artifactId>