From 048a96429bd6037aab598a01af5a10fa2a2804d0 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 23 Mar 2018 16:33:49 +0100
Subject: [PATCH] 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>
---
 artifacts/pom.xml                             |  7 +++
 features/features-groupbasedpolicy/pom.xml    |  6 +++
 .../pom.xml                                   | 53 +++++++++++++++++++
 features/odl-groupbasedpolicy-ios-xe/pom.xml  |  8 +--
 .../pom.xml                                   |  8 +--
 .../pom.xml                                   |  8 +--
 .../pom.xml                                   |  8 +--
 features/odl-groupbasedpolicy-vpp/pom.xml     |  8 +--
 features/pom.xml                              |  1 +
 9 files changed, 92 insertions(+), 15 deletions(-)
 create mode 100644 features/odl-groupbasedpolicy-domain-extensions/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8633abec2..9af296902 100755
--- 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 05cef1d0a..fee2eaf57 100644
--- 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
index 000000000..92b77e61a
--- /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 6fc8341b0..f01f8dc77 100644
--- 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 902f4a85e..3ef53065f 100644
--- 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 0c3567da8..1caec1a9f 100644
--- 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 196c1f823..a20fe5302 100644
--- 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 cc9d9b3fb..235a3c002 100644
--- 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 070b631a7..c54c44ff8 100755
--- 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>
-- 
2.36.6