Package domain-extensions in a separate feature

Rather than having it packaged multiple times, use a dedicated
feature.

Change-Id: Ie9071fdd1b24cb6369edbc8340e9ed86fa1204c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8633abec2564f218f23d4954bc9f04423908827b..9af296902570700259ff50a5eb5e104839e95a78 100755 (executable)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -230,6 +230,13 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
+        <version>${project.version}</version>
+        <classifier>features</classifier>
+        <type>xml</type>
+      </dependency>
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>odl-groupbasedpolicy-ofoverlay</artifactId>

diff --git a/features/features-groupbasedpolicy/pom.xml b/features/features-groupbasedpolicy/pom.xml
index 05cef1d0adab86b12a828f724a6c4b048edd5c2a..fee2eaf57ecfb7feaadf8775b4bd487f610e8d75 100644 (file)
--- a/features/features-groupbasedpolicy/pom.xml
+++ b/features/features-groupbasedpolicy/pom.xml
@@ -39,6 +39,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-groupbasedpolicy-ofoverlay</artifactId>

diff --git a/features/odl-groupbasedpolicy-domain-extensions/pom.xml b/features/odl-groupbasedpolicy-domain-extensions/pom.xml
new file mode 100644 (file)
index 0000000..92b77e6
--- /dev/null
+++ b/features/odl-groupbasedpolicy-domain-extensions/pom.xml
@@ -0,0 +1,53 @@
+<?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>3.0.2</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.groupbasedpolicy</groupId>
+    <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+    <!--
+         The Neutron provider
+    -->
+    <!-- <name> formatting is used by autorelease to parse and notify projects on
+       build failure. Please do not modify this unless you have a good reason. -->
+    <name>ODL :: groupbasedpolicy :: ${project.artifactId}</name>
+
+    <properties>
+        <neutron.version>0.11.0-SNAPSHOT</neutron.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- ODL-GBP-ARTIFACTS -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>groupbasedpolicy-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>l2-l3-domain-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+    </dependencies>
+</project>

diff --git a/features/odl-groupbasedpolicy-ios-xe/pom.xml b/features/odl-groupbasedpolicy-ios-xe/pom.xml
index 6fc8341b0aae0c0da8e882c1c9b667b3418750e2..f01f8dc77752cb0072967ee148f4feb5cbfd0e9f 100644 (file)
--- a/features/odl-groupbasedpolicy-ios-xe/pom.xml
+++ b/features/odl-groupbasedpolicy-ios-xe/pom.xml
@@ -51,15 +51,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>l2-l3-domain-extension</artifactId>
+            <artifactId>ios-xe-renderer</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ios-xe-renderer</artifactId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
index 902f4a85e48d2b61fdc4776aaef96b0c05105b95..3ef53065fe906c5f72806498077989b602333551 100644 (file)
--- a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
@@ -37,15 +37,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>l2-l3-domain-extension</artifactId>
+            <artifactId>ne-location-provider</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>ne-location-provider</artifactId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-groupbasedpolicy-neutronmapper/pom.xml b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
index 0c3567da8db39a06580c6036ac11479e9167a760..1caec1a9f136bbf6c784e983b73bbb730a80c7d2 100644 (file)
--- a/features/odl-groupbasedpolicy-neutronmapper/pom.xml
+++ b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
@@ -49,15 +49,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>l2-l3-domain-extension</artifactId>
+            <artifactId>neutron-mapper</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>neutron-mapper</artifactId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
index 196c1f823dfe9f43f714f80555ff09814a9def2f..a20fe5302b6020f0be58d8b8b9388266a70657fb 100644 (file)
--- a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
@@ -41,15 +41,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>l2-l3-domain-extension</artifactId>
+            <artifactId>sxp-ep-provider</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>sxp-ep-provider</artifactId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-groupbasedpolicy-vpp/pom.xml b/features/odl-groupbasedpolicy-vpp/pom.xml
index cc9d9b3fbad4407d8a40348a627741d4e6327dc8..235a3c002bffed132d361c92eea913ad4415bd63 100644 (file)
--- a/features/odl-groupbasedpolicy-vpp/pom.xml
+++ b/features/odl-groupbasedpolicy-vpp/pom.xml
@@ -66,15 +66,17 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>l2-l3-domain-extension</artifactId>
+            <artifactId>vpp-renderer</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>vpp-renderer</artifactId>
+            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-groupbasedpolicy-base</artifactId>
+            <artifactId>odl-groupbasedpolicy-domain-extensions</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 070b631a748885e503c27e9f30bd5d9bc0057ebd..c54c44ff8707d05b97cb207d5d47ab51da24d1c9 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,6 +20,7 @@
     <modules>
         <module>features-groupbasedpolicy</module>
         <module>odl-groupbasedpolicy-base</module>
+        <module>odl-groupbasedpolicy-domain-extensions</module>
         <module>odl-groupbasedpolicy-ofoverlay</module>
         <module>odl-groupbasedpolicy-iovisor</module>
         <module>odl-groupbasedpolicy-neutronmapper</module>