Add controller's single-feature-parent

Sharing common knobs cuts down on duplication and allows us to
keep consistency.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8a00939..d11ef7c 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -231,6 +231,48 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <!-- Config files -->
+            <dependency>
+                <!-- finalname="configuration/initial/akka.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>akkaconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/factory/akka.conf" override="true" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>factoryakkaconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/initial/module-shards.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>moduleshardconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="configuration/initial/modules.conf" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>moduleconf</classifier>
+            </dependency>
+            <dependency>
+                <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-clustering-config</artifactId>
+                <version>${project.version}</version>
+                <type>cfg</type>
+                <classifier>datastore</classifier>
+            </dependency>
+
             <!-- Features -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -337,30 +379,37 @@
             </dependency>
 
             <!-- Config remnants -->
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-event-executor-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-threadgroup-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-timer-config</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>threadpool-config-api</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>threadpool-config-impl</artifactId>
-                 <version>0.13.0-SNAPSHOT</version>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-event-executor-config</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-threadgroup-config</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>netty-timer-config</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>threadpool-config-api</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>threadpool-config-impl</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-config-netty</artifactId>
+                <version>0.13.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/features/odl-benchmark-api/pom.xml b/features/odl-benchmark-api/pom.xml
index 9d9c8f9..255ad1a 100644 (file)
--- a/features/odl-benchmark-api/pom.xml
+++ b/features/odl-benchmark-api/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -27,14 +27,12 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>benchmark-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/features/odl-clustering-test-app/pom.xml b/features/odl-clustering-test-app/pom.xml
index 4b6057c..69c6e07 100644 (file)
--- a/features/odl-clustering-test-app/pom.xml
+++ b/features/odl-clustering-test-app/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -21,18 +21,6 @@
     <version>1.12.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
@@ -41,9 +29,8 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-config-netty/pom.xml b/features/odl-config-netty/pom.xml
index 7419a06..ece654d 100644 (file)
--- a/features/odl-config-netty/pom.xml
+++ b/features/odl-config-netty/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -23,18 +23,6 @@
 
     <name>OpenDaylight :: Config-Netty</name>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
@@ -49,23 +37,23 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-event-executor-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-threadgroup-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>netty-timer-config</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>threadpool-config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>threadpool-config-impl</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/odl-controller-blueprint/pom.xml b/features/odl-controller-blueprint/pom.xml
index e5caa98..331a24b 100644 (file)
--- a/features/odl-controller-blueprint/pom.xml
+++ b/features/odl-controller-blueprint/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -25,28 +25,10 @@
     <description>OpenDaylight Controller Blueprint Extension</description>
 
     <properties>
+        <!-- Note: this is required as it is used in feature.xml -->
         <blueprint.version>0.13.0-SNAPSHOT</blueprint.version>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -73,7 +55,7 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>blueprint</artifactId>
             <version>${blueprint.version}</version>
         </dependency>

diff --git a/features/odl-controller-mdsal-common/pom.xml b/features/odl-controller-mdsal-common/pom.xml
index ea8b0ee..99df67f 100644 (file)
--- a/features/odl-controller-mdsal-common/pom.xml
+++ b/features/odl-controller-mdsal-common/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -23,25 +23,6 @@
 
     <name>OpenDaylight :: MDSAL :: Common</name>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -56,7 +37,7 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/odl-controller-model-topology/pom.xml b/features/odl-controller-model-topology/pom.xml
index 38afe0e..0d70acc 100644 (file)
--- a/features/odl-controller-model-topology/pom.xml
+++ b/features/odl-controller-model-topology/pom.xml
@@ -9,10 +9,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -22,25 +22,6 @@
 
     <name>OpenDaylight :: MD-SAL :: Topology Model</name>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/features/odl-dsbenchmark/pom.xml b/features/odl-dsbenchmark/pom.xml
index af68952..6caab98 100644 (file)
--- a/features/odl-dsbenchmark/pom.xml
+++ b/features/odl-dsbenchmark/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -25,21 +25,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-benchmark-api</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>dsbenchmark</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/features/odl-jolokia/pom.xml b/features/odl-jolokia/pom.xml
index 0e0f067..5414e0b 100644 (file)
--- a/features/odl-jolokia/pom.xml
+++ b/features/odl-jolokia/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -34,7 +34,7 @@
         </dependency>
         <dependency>
             <!-- finalname="/etc/org.jolokia.osgi.cfg" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-jolokia-osgi</artifactId>
             <version>${odl-jolokia-osgi.version}</version>
             <type>cfg</type>

diff --git a/features/odl-mdsal-benchmark/pom.xml b/features/odl-mdsal-benchmark/pom.xml
index 1d971bc..9144c32 100644 (file)
--- a/features/odl-mdsal-benchmark/pom.xml
+++ b/features/odl-mdsal-benchmark/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -25,35 +25,34 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-benchmark-api</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-dsbenchmark</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-ntfbenchmark</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>rpcbenchmark</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/features/odl-mdsal-broker-local/pom.xml b/features/odl-mdsal-broker-local/pom.xml
index 56b08b4..db6e40e 100644 (file)
--- a/features/odl-mdsal-broker-local/pom.xml
+++ b/features/odl-mdsal-broker-local/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -32,32 +32,6 @@
         <skip.karaf.featureTest>true</skip.karaf.featureTest>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -93,7 +67,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>
-            <version>0.13.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-mdsal-broker/pom.xml b/features/odl-mdsal-broker/pom.xml
index 1a7f92a..7b1bbf6 100644 (file)
--- a/features/odl-mdsal-broker/pom.xml
+++ b/features/odl-mdsal-broker/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -24,25 +24,6 @@
     <name>OpenDaylight :: MDSAL :: Broker (clustered)</name>
     <description>OpenDaylight Controller stack with clustering</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
@@ -58,13 +39,13 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-remoterpc-connector</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-distributed-datastore</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
@@ -73,7 +54,6 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-config-netty</artifactId>
-            <version>0.13.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-mdsal-clustering-commons/pom.xml b/features/odl-mdsal-clustering-commons/pom.xml
index 9d72da1..adf146e 100644 (file)
--- a/features/odl-mdsal-clustering-commons/pom.xml
+++ b/features/odl-mdsal-clustering-commons/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -24,18 +24,6 @@
     <name>OpenDaylight :: Controller :: Clustering Commons</name>
     <description>Common Clustering utilities</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
@@ -87,21 +75,18 @@
         </dependency>
 
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-commons</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-akka-raft</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Segmented Journal for Akka, including Kryo and asm-5.2 -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-akka-segmented-journal</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.esotericsoftware</groupId>

diff --git a/features/odl-mdsal-distributed-datastore/pom.xml b/features/odl-mdsal-distributed-datastore/pom.xml
index 75cb0c5..ce900f8 100644 (file)
--- a/features/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/odl-mdsal-distributed-datastore/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -24,32 +24,6 @@
     <name>OpenDaylight :: Controller :: Clustered Datastore</name>
     <description>Controller Clustered Datastore (akka-based)</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yangtools-artifacts</artifactId>
-                <version>5.0.1</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
@@ -82,83 +56,78 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-clustering-commons</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-controller-blueprint</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>cds-access-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>cds-access-client</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>cds-dom-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-distributed-datastore</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-distributed-eos</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-cluster-admin-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-cluster-admin-impl</artifactId>
         </dependency>
 
         <dependency>
             <!-- finalname="configuration/initial/akka.conf" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>akkaconf</classifier>
         </dependency>
         <dependency>
             <!-- finalname="configuration/factory/akka.conf" override="true" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>factoryakkaconf</classifier>
         </dependency>
         <dependency>
             <!-- finalname="configuration/initial/module-shards.conf" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>moduleshardconf</classifier>
         </dependency>
         <dependency>
             <!-- finalname="configuration/initial/modules.conf" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>moduleconf</classifier>
         </dependency>
         <dependency>
             <!-- finalname="etc/org.opendaylight.controller.cluster.datastore.cfg" -->
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-clustering-config</artifactId>
-            <version>${project.version}</version>
             <type>cfg</type>
             <classifier>datastore</classifier>
         </dependency>

diff --git a/features/odl-mdsal-model-inventory/pom.xml b/features/odl-mdsal-model-inventory/pom.xml
index 4d5eba1..e2c19f4 100644 (file)
--- a/features/odl-mdsal-model-inventory/pom.xml
+++ b/features/odl-mdsal-model-inventory/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -23,25 +23,6 @@
 
     <name>OpenDaylight :: MD-SAL :: Inventory Model</name>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/features/odl-mdsal-remoterpc-connector/pom.xml b/features/odl-mdsal-remoterpc-connector/pom.xml
index a2d1743..6f4631b 100644 (file)
--- a/features/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/odl-mdsal-remoterpc-connector/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -24,27 +24,15 @@
     <name>OpenDaylight :: Controller :: Remote RPC Connector</name>
     <description>Clustering remote RPC support</description>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>1.12.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-distributed-datastore</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-remoterpc-connector</artifactId>
         </dependency>
     </dependencies>

diff --git a/features/odl-message-bus-collector/pom.xml b/features/odl-message-bus-collector/pom.xml
index 23212f7..fbc133b 100644 (file)
--- a/features/odl-message-bus-collector/pom.xml
+++ b/features/odl-message-bus-collector/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -25,27 +25,7 @@
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>controller-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>6.0.0</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
-        <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-binding-base -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-model-inventory</artifactId>

diff --git a/features/odl-ntfbenchmark/pom.xml b/features/odl-ntfbenchmark/pom.xml
index ddc539b..867d6e4 100644 (file)
--- a/features/odl-ntfbenchmark/pom.xml
+++ b/features/odl-ntfbenchmark/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -25,21 +25,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>1.12.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-benchmark-api</artifactId>
             <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>ntfbenchmark</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/features/odl-toaster/pom.xml b/features/odl-toaster/pom.xml
index 51ff3b2..9d3c812 100644 (file)
--- a/features/odl-toaster/pom.xml
+++ b/features/odl-toaster/pom.xml
@@ -10,10 +10,10 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
+        <groupId>org.opendaylight.controller</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
+        <version>1.12.0-SNAPSHOT</version>
+        <relativePath>../single-feature-parent</relativePath>
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
@@ -27,14 +27,12 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>
-            <version>6.0.0</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>${project.version}</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 185b026..29ae8cb 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -26,6 +26,9 @@
   </properties>
 
   <modules>
+    <!-- Common infra to cut down definitions -->
+    <module>single-feature-parent</module>
+
     <!-- Single features, to be cleaned up -->
     <module>odl-benchmark-api</module>
     <module>odl-clustering-test-app</module>

diff --git a/features/single-feature-parent/pom.xml b/features/single-feature-parent/pom.xml
new file mode 100644 (file)
index 0000000..8a0e971
--- /dev/null
+++ b/features/single-feature-parent/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2020 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
+ -->
+<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>7.0.1</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>single-feature-parent</artifactId>
+    <version>1.12.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-parent</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>