BUG-9218: eliminate duplicate bundles

Packaging api bundles in multiple features causes inefficiency
in Karaf4. Introduce org-bgpcep-{bmp,rsvp,bgp-parser}-api
features to hold them.

Change-Id: I6351c945bbf3e272187dcd875854bff40c9b4f11
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit c0fcacdeb1a8049dd9493d64fb3d52bd39594b74)

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 22de1dc47c3a76097c1a8476d81e760b222cce04..1dd1d0fad3617a1272d85cd0e963ad27c9858c55 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -540,6 +540,13 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
                 <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
@@ -631,6 +638,7 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+
             <!-- BMP Features artifacts -->
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
@@ -646,6 +654,14 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>odl-bgpcep-bmp-api</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- Extras Features artifacts -->
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
@@ -777,7 +793,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
+                <artifactId>odl-bgpcep-rsvp-api</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>
@@ -789,6 +805,13 @@
                 <type>xml</type>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
+                <classifier>features</classifier>
+                <type>xml</type>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/features/bgp/features-bgp/pom.xml b/features/bgp/features-bgp/pom.xml
index 34dc7cc3ed92ab16d345af0730cc1b3c468bbd9d..42216420a72e316ef3c46bf211dcf86ed560765a 100644 (file)
--- a/features/bgp/features-bgp/pom.xml
+++ b/features/bgp/features-bgp/pom.xml
@@ -65,6 +65,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-rib-api</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
index 9805c73a053bdf7f82991a47944a2dbdfa1191a3..6bc74c9f6e28151683108f8eda808db090e07d48 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
@@ -31,10 +31,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-evpn</artifactId>
@@ -47,13 +43,13 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
+            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
+            <artifactId>odl-bgpcep-bmp-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
index 73728f407ae1d26bf4b8302c2d92371846b1baa6..74cd3582c13f4460e055301123728278b60f6810 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-inet/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-inet/pom.xml
@@ -35,10 +35,6 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>bgp-inet</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-parser</artifactId>
@@ -47,13 +43,13 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
+            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
+            <artifactId>odl-bgpcep-bmp-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
index a70ed62c309cb32eec44b5c3f939cfb624f035a7..42f7505e2a5bf2bbbd128e772980851623528ef2 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
@@ -47,19 +47,19 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
+            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-rsvp</artifactId>
+            <artifactId>odl-bgpcep-bmp-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-openconfig</artifactId>
+            <artifactId>odl-bgpcep-rsvp</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
new file mode 100644 (file)
index 0000000..67cfb31
--- /dev/null
+++ b/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.bgpcep</groupId>
+    <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
+    <version>0.8.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: BGP :: Parser :: API</name>
+
+    <dependencyManagement>
+        <!-- ODL-BGP-ARTIFACTS -->
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>dependency-version-management</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-config-core</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+</project>

diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
index 358217d0be66e0904c5d0537101e65e33c6e573c..87a97c184026c7ebdf324f09b710c0aade647335 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-parser/pom.xml
@@ -40,25 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>odl-config-core</artifactId>
+            <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -68,6 +50,11 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-parser-impl</artifactId>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
index 4c0c9d478a31122992168c8165c09420577a39ac..7d4923a80fad01b3490bf0c9363a2a9d0b7192c2 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
@@ -40,23 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-parser-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-rib-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
+            <artifactId>odl-bgpcep-bgp-parser-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -72,6 +56,15 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-rib-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-rib-spi</artifactId>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
index 0a8865cbeef59958aafdab9ab8460851cb398fae..7bb1921671137b9988456467c6eac56621d03863 100644 (file)
--- a/features/bgp/pom.xml
+++ b/features/bgp/pom.xml
@@ -30,6 +30,7 @@
         <module>odl-bgpcep-bgp-openconfig</module>
         <module>odl-bgpcep-bgp-inet</module>
         <module>odl-bgpcep-bgp-parser</module>
+        <module>odl-bgpcep-bgp-parser-api</module>
         <module>odl-bgpcep-bgp-rib-api</module>
         <module>odl-bgpcep-bgp-linkstate</module>
         <module>odl-bgpcep-bgp-flowspec</module>

diff --git a/features/bmp/features-bmp/pom.xml b/features/bmp/features-bmp/pom.xml
index 49fd1a2f22d1773c0deecd5a1de6781841a0cd1e..f835f4fff69b5c27a16aee4b2f955d0588fd1efd 100644 (file)
--- a/features/bmp/features-bmp/pom.xml
+++ b/features/bmp/features-bmp/pom.xml
@@ -34,6 +34,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-bmp-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/bmp/odl-bgpcep-bmp-api/pom.xml b/features/bmp/odl-bgpcep-bmp-api/pom.xml
new file mode 100644 (file)
index 0000000..8033fc4
--- /dev/null
+++ b/features/bmp/odl-bgpcep-bmp-api/pom.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.bgpcep</groupId>
+    <artifactId>odl-bgpcep-bmp-api</artifactId>
+    <version>0.8.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: BMP :: API</name>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- ODL-BGP-ARTIFACTS -->
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>dependency-version-management</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-spi</artifactId>
+        </dependency>
+    </dependencies>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+</project>

diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/bmp/odl-bgpcep-bmp/pom.xml
index ec905de0d2392ea366bc60e468d1a3d5abbdf491..792a00a7f56df1d9eaaae526a0ea7e1f7f6ba2ca 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/bmp/odl-bgpcep-bmp/pom.xml
@@ -38,22 +38,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-parser-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bgp-bmp-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-bgp-dependencies</artifactId>
@@ -68,7 +52,7 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-bgp-rib-api</artifactId>
+            <artifactId>odl-bgpcep-bmp-api</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
@@ -150,6 +134,15 @@
             <type>xml</type>
             <classifier>bmp-config-example</classifier>
         </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-parser-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>bgp-bmp-impl</artifactId>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml
index 6d910c5c618bc41d4a855379425b7a052ec63dd5..695bb0ff0407bef9583b68311c4a178d0e73ed38 100644 (file)
--- a/features/bmp/pom.xml
+++ b/features/bmp/pom.xml
@@ -16,6 +16,7 @@
     <modules>
         <module>features-bmp</module>
         <module>odl-bgpcep-bmp</module>
+        <module>odl-bgpcep-bmp-api</module>
     </modules>
 
     <!--

diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/pcep/odl-bgpcep-pcep-api/pom.xml
index 3071aec1d9112110e18308cab65f8bf6eb3b747a..8e2ca966e8c0ca8a69b082c8d7550adbf512ac94 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-api/pom.xml
+++ b/features/pcep/odl-bgpcep-pcep-api/pom.xml
@@ -38,10 +38,6 @@
     </dependencyManagement>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>rsvp-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
@@ -80,6 +76,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-rsvp-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 
     <!--

diff --git a/features/rsvp/features-rsvp/pom.xml b/features/rsvp/features-rsvp/pom.xml
index f994a34673553c97b9635a341b137e41ae75b8a8..dfe75384812d738bfdf641ea7aa126f9be3c9350 100644 (file)
--- a/features/rsvp/features-rsvp/pom.xml
+++ b/features/rsvp/features-rsvp/pom.xml
@@ -35,6 +35,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-rsvp-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
@@ -58,4 +64,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
new file mode 100644 (file)
index 0000000..45669b1
--- /dev/null
+++ b/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.bgpcep</groupId>
+    <artifactId>odl-bgpcep-rsvp-api</artifactId>
+    <version>0.8.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>OpenDaylight :: RSVP :: API</name>
+
+    <dependencyManagement>
+        <!-- ODL-BGP-ARTIFACTS -->
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.bgpcep</groupId>
+                <artifactId>bgpcep-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rsvp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>rsvp-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+    </dependencies>
+
+    <!--
+        Maven Site Configuration
+
+        The following configuration is necessary for maven-site-plugin to
+        correctly identify the correct deployment path for OpenDaylight Maven
+        sites.
+    -->
+    <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+    <distributionManagement>
+        <site>
+            <id>opendaylight-site</id>
+            <url>${nexus.site.url}/${project.artifactId}/</url>
+        </site>
+    </distributionManagement>
+</project>

diff --git a/features/rsvp/odl-bgpcep-rsvp/pom.xml b/features/rsvp/odl-bgpcep-rsvp/pom.xml
index 5572de48aa275718a72a81e57a69a9f559da9dd7..9ba30f0b60a550dfbdd47cb7d7d411d3e8dc8a14 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp/pom.xml
+++ b/features/rsvp/odl-bgpcep-rsvp/pom.xml
@@ -33,22 +33,21 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>rsvp-api</artifactId>
+            <artifactId>odl-bgpcep-rsvp-api</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>rsvp-spi</artifactId>
+            <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
         </dependency>
+
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rsvp-impl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-bgpcep-rsvp-dependencies</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 
     <!--
@@ -66,4 +65,4 @@
             <url>${nexus.site.url}/${project.artifactId}/</url>
         </site>
     </distributionManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml
index ee797ae6b8e13cd0789aa2d3799b274132305cd4..ad840f293b0c54f4563ccb64bd40ee7193be18d2 100644 (file)
--- a/features/rsvp/pom.xml
+++ b/features/rsvp/pom.xml
@@ -27,6 +27,7 @@
     <modules>
         <module>features-rsvp</module>
         <module>odl-bgpcep-rsvp</module>
+        <module>odl-bgpcep-rsvp-api</module>
         <module>odl-bgpcep-rsvp-dependencies</module>
     </modules>