Decouple and create features per each topology bundle

Change-Id: I06e914041d48b4aefb6d234094f6c2af0f94b55b
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/pcep/odl-bgpcep-programming-api/pom.xml
index 6b237f945cc9af2fbc219f1daab2b437882b56c3..92e2164f1c126cdb8b116b48f3beb66114c38649 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-api/pom.xml
+++ b/features/pcep/odl-bgpcep-programming-api/pom.xml
@@ -22,10 +22,6 @@
     <name>OpenDaylight :: PCEP :: Programming Api</name>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>topology-tunnel-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>programming-api</artifactId>
@@ -48,6 +44,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-extras-dependencies</artifactId>

diff --git a/features/topology/features-topology/pom.xml b/features/topology/features-topology/pom.xml
index de80be812c0be7a754fc7d025e3b5dd11fab4e75..684979e7415bcd1972e1ca857ee581eadc409907 100644 (file)
--- a/features/topology/features-topology/pom.xml
+++ b/features/topology/features-topology/pom.xml
@@ -28,5 +28,17 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-segment-routing</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

diff --git a/features/topology/odl-bgpcep-topology-segment-routing/pom.xml b/features/topology/odl-bgpcep-topology-segment-routing/pom.xml
new file mode 100644 (file)
index 0000000..3446e7d
--- /dev/null
+++ b/features/topology/odl-bgpcep-topology-segment-routing/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+
+ 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.bgpcep</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <relativePath>../../../single-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-bgpcep-topology-segment-routing</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: BGPCEP :: Topology :: Segment :: Routing :: Api</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>topology-segment-routing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/features/topology/odl-bgpcep-topology-tunnel-api/pom.xml b/features/topology/odl-bgpcep-topology-tunnel-api/pom.xml
new file mode 100644 (file)
index 0000000..c6c0582
--- /dev/null
+++ b/features/topology/odl-bgpcep-topology-tunnel-api/pom.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
+
+ 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.bgpcep</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>0.11.0-SNAPSHOT</version>
+        <relativePath>../../../single-feature-parent</relativePath>
+    </parent>
+
+    <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+    <packaging>feature</packaging>
+    <name>OpenDaylight :: BGPCEP :: Topology :: Tunnel :: Api</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>topology-tunnel-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>odl-mdsal-model-draft-clemm-netmod-yang-network-topo-01-minimal</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file

diff --git a/features/topology/pom.xml b/features/topology/pom.xml
index a7c744470caacca22ddf30f467afa38137233aad..d244e6180c7247c9dfbcc8aaa068291490b44135 100644 (file)
--- a/features/topology/pom.xml
+++ b/features/topology/pom.xml
@@ -24,5 +24,7 @@
     <modules>
         <module>features-topology</module>
         <module>odl-bgpcep-topology-api</module>
+        <module>odl-bgpcep-topology-tunnel-api</module>
+        <module>odl-bgpcep-topology-segment-routing</module>
     </modules>
 </project>

diff --git a/topology/topology-artifacts/pom.xml b/topology/topology-artifacts/pom.xml
index 2ddfdb34bb476aef587c09cb54761e4d5163c590..4847e68b112ec119aeb74beac22cf8ecdd472df2 100644 (file)
--- a/topology/topology-artifacts/pom.xml
+++ b/topology/topology-artifacts/pom.xml
@@ -53,6 +53,20 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>
+                <type>xml</type>
+                <classifier>features</classifier>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-bgpcep-topology-segment-routing</artifactId>
+                <type>xml</type>
+                <classifier>features</classifier>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>