Split out odl-controller-blueprint

Blueprint only needs controller APIs, it does not need implementation
and it should be packaged in odl-config-netty.

This patch splits it out in a separately-tested feature

JIRA: CONTROLLER-1584
Change-Id: I4b12a3880b32fc21515dbb1e69f7e21b7c4d5c57
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 4a3043c39e08bc19279c7888696e7afb112f99b7..cdaf0ff2845a3bbe9dad8272a2449f4cd72179c2 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -51,7 +51,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-controller-binding-api</artifactId>
+            <artifactId>odl-controller-blueprint</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -81,11 +81,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>blueprint</artifactId>
-            <version>0.11.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 
 </project>

diff --git a/features/mdsal/features-mdsal/pom.xml b/features/mdsal/features-mdsal/pom.xml
index a781d69784e600b71ba05ad3629ab4b4c9ab0114..a7bfe505eb3b955e4b4fc56a46882bbc331dc6b1 100644 (file)
--- a/features/mdsal/features-mdsal/pom.xml
+++ b/features/mdsal/features-mdsal/pom.xml
@@ -127,5 +127,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-controller-blueprint</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>

diff --git a/features/mdsal/odl-controller-blueprint/pom.xml b/features/mdsal/odl-controller-blueprint/pom.xml
new file mode 100644 (file)
index 0000000..a601a24
--- /dev/null
+++ b/features/mdsal/odl-controller-blueprint/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2016, 2017 Red Hat, Inc. 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-blueprint</artifactId>
+    <version>1.10.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: Controller :: Blueprint</name>
+    <description>OpenDaylight Controller Blueprint Extension</description>
+
+    <properties>
+        <blueprint.version>0.11.0-SNAPSHOT</blueprint.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>3.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-codec</artifactId>
+            <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>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>blueprint</artifactId>
+            <version>${blueprint.version}</version>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml b/features/mdsal/odl-controller-blueprint/src/main/feature/feature.xml
new file mode 100644 (file)
index 0000000..636ef9f
--- /dev/null
+++ b/features/mdsal/odl-controller-blueprint/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-blueprint-${project.version}">
+    <feature name="odl-controller-blueprint" version="${project.version}">
+        <feature version="[3,4)">odl-yangtools-codec</feature>
+        <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
+    </feature>
+</features>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index af41046c11c7895444579cc3a5d0a4b0c486896c..0ca3406360aaad16711800279fda14c8bb6cbc01 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -24,7 +24,6 @@
     <name>OpenDaylight :: MDSAL :: Broker</name>
 
     <properties>
-        <blueprint.version>0.11.0-SNAPSHOT</blueprint.version>
         <!-- CONTROLLER-1584 -->
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
     </properties>

diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index 27ae27ce0b04240cfa65d995240b106d66477d4c..7e5996cfaf91e43f26fbd9fc92de7dd62f6757de 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -9,7 +9,5 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[5,6)">odl-lmax-3</feature>
-        <feature version="[3,4)">odl-yangtools-codec</feature>
-        <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
     </feature>
 </features>

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index 6de0c4cb0b54d706f28edd86587b0a0a27d8a476..0a3072a7bb35807820ba4090d3495a1dcc83b8ba 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -29,6 +29,7 @@
         <module>odl-controller-binding-api</module>
         <module>odl-controller-dom-api</module>
         <module>odl-mdsal-clustering-commons</module>
+        <module>odl-controller-blueprint</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 0a220a00ca5275fe1e09d5521178e05ad8bb1dff..28982ab106bc1779e668199f1ed24e156b12670b 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/opendaylight/md-sal/mdsal-artifacts/pom.xml
@@ -363,6 +363,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-controller-blueprint</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-mdsal-distributed-datastore</artifactId>