Centralize artifacts 27/89127/1
authorRobert Varga <robert.varga@pantheon.tech>
Sat, 18 Apr 2020 20:47:32 +0000 (22:47 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 18 Apr 2020 21:00:25 +0000 (23:00 +0200)
Rather than having three different sets of artifacts:
- mdsal-artifacts
- config-artifacts
- benchmark-artifacts

Create a project-wide controller-artifacts, just as the guidelines
tell us to. This has the benefit for downstreams, as they do not
need to track multiple versions. It also benefits us, as we have
a single place for tracking what we produce.

Change-Id: I73cc02c6f1df6c4d705ef83dfc57e6aad17c6287
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
24 files changed:
artifacts/pom.xml [moved from opendaylight/md-sal/mdsal-artifacts/pom.xml with 84% similarity]
benchmark/artifacts/pom.xml [deleted file]
benchmark/dsbenchmark/pom.xml
benchmark/ntfbenchmark/pom.xml
benchmark/pom.xml
benchmark/rpcbenchmark/pom.xml
docs/pom.xml
features/config-netty/odl-config-netty/pom.xml
features/mdsal/odl-controller-mdsal-common/pom.xml
features/mdsal/odl-controller-model-topology/pom.xml
features/mdsal/odl-mdsal-broker-local/pom.xml
features/mdsal/odl-mdsal-broker/pom.xml
features/mdsal/odl-mdsal-distributed-datastore/pom.xml
features/mdsal/odl-mdsal-model-inventory/pom.xml
features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
features/mdsal/odl-message-bus-collector/pom.xml
opendaylight/blueprint/pom.xml
opendaylight/config/config-artifacts/pom.xml [deleted file]
opendaylight/config/pom.xml
opendaylight/md-sal/mdsal-it-base/pom.xml
opendaylight/md-sal/mdsal-it-parent/pom.xml
opendaylight/md-sal/parent/pom.xml
opendaylight/md-sal/pom.xml
pom.xml

similarity index 84%
rename from opendaylight/md-sal/mdsal-artifacts/pom.xml
rename to artifacts/pom.xml
index 6361ef7..e8b2c0f 100644 (file)
@@ -19,7 +19,7 @@
     </parent>
 
     <groupId>org.opendaylight.controller</groupId>
-    <artifactId>mdsal-artifacts</artifactId>
+    <artifactId>controller-artifacts</artifactId>
     <version>1.12.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
                 <version>${project.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>mdsal-it-base</artifactId>
+                <version>${project.version}</version>
+                <scope>test</scope>
+            </dependency>
 
             <!-- Features -->
             <dependency>
                 <type>xml</type>
                 <scope>runtime</scope>
             </dependency>
-            <dependency>
-              <groupId>${project.groupId}</groupId>
-              <artifactId>features-restconf</artifactId>
-              <version>${project.version}</version>
-              <classifier>features</classifier>
-              <type>xml</type>
-              <scope>runtime</scope>
-            </dependency>
 
             <!-- Base model augmentations -->
             <dependency>
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- Benchmarks -->
+            <dependency>
+               <groupId>${project.groupId}</groupId>
+                <artifactId>benchmark-api</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>dsbenchmark</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>benchmark-features</artifactId>
+                <version>1.10.0-SNAPSHOT</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
+            <!-- Config remnants -->
+            <dependency>
+                 <groupId>${project.groupId}</groupId>
+                 <artifactId>netty-config-api</artifactId>
+                 <version>0.13.0-SNAPSHOT</version>
+             </dependency>
+             <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>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/benchmark/artifacts/pom.xml b/benchmark/artifacts/pom.xml
deleted file mode 100644 (file)
index d6ad585..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (c) 2015 Cisco Systems and others.  All rights reserved.
-
-This program and the accompanying materials are made available under the
-terms of the Eclipse Public License v1.0 which accompanies this distribution,
-and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>7.0.1</version>
-    <relativePath/>
-  </parent>
-
-  <groupId>org.opendaylight.controller</groupId>
-  <artifactId>benchmark-artifacts</artifactId>
-  <version>1.10.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>benchmark-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>dsbenchmark</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>benchmark-features</artifactId>
-        <version>${project.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-</project>
index 1dae6f6..b04da8e 100644 (file)
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>benchmark-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
index c88d687..f992bbe 100644 (file)
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>benchmark-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
index f9ec2fd..7b92fd4 100644 (file)
@@ -23,6 +23,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <module>dsbenchmark</module>
     <module>ntfbenchmark</module>
     <module>rpcbenchmark</module>
-    <module>artifacts</module>
   </modules>
 </project>
index d85422f..a62d98d 100644 (file)
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
@@ -38,7 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>benchmark-api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
index 91ce0e1..fbc24a7 100644 (file)
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>0.13.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
index 11eaf17..7419a06 100644 (file)
         <dependencies>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>config-artifacts</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
index e5a3241..db96d78 100644 (file)
                 <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>
 
@@ -51,7 +58,6 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${project.version}</version>
         </dependency>
     </dependencies>
 
index 986b0b7..24a949e 100644 (file)
@@ -33,8 +33,8 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${project.version}</version>
+                <artifactId>controller-artifacts</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 3bcc08b..70be4d9 100644 (file)
@@ -50,7 +50,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
index 7fd0568..a2a8b94 100644 (file)
@@ -35,7 +35,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
index 97e1ed9..e047b95 100644 (file)
@@ -42,7 +42,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
index 9c618e2..37b7cc8 100644 (file)
@@ -34,8 +34,8 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${project.version}</version>
+                <artifactId>controller-artifacts</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 95540f6..a2d1743 100644 (file)
@@ -28,8 +28,8 @@
         <dependencies>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${project.version}</version>
+                <artifactId>controller-artifacts</artifactId>
+                <version>1.12.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 6e5bd4e..0d12710 100644 (file)
@@ -29,7 +29,7 @@
         <dependencies>
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
+                <artifactId>controller-artifacts</artifactId>
                 <version>${project.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
index 98cb037..8a2cf1f 100644 (file)
@@ -33,7 +33,7 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
diff --git a/opendaylight/config/config-artifacts/pom.xml b/opendaylight/config/config-artifacts/pom.xml
deleted file mode 100644 (file)
index d48906b..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-    Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v1.0 which accompanies this distribution,
-    and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>7.0.1</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-artifacts</artifactId>
-    <version>0.13.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                 <groupId>${project.groupId}</groupId>
-                 <artifactId>netty-config-api</artifactId>
-                 <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netty-event-executor-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netty-threadgroup-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>netty-timer-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>threadpool-config-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>threadpool-config-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-</project>
-
index 3cac66f..ec7e8c5 100644 (file)
     <module>netty-threadgroup-config</module>
     <module>netty-event-executor-config</module>
     <module>netty-timer-config</module>
-    <module>config-artifacts</module>
   </modules>
 
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 946065c..be18eff 100644 (file)
@@ -32,8 +32,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${project.version}</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 72eb79c..74bf6c9 100644 (file)
@@ -23,7 +23,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <packaging>pom</packaging>
 
   <properties>
-    <mdsal.version>1.12.0-SNAPSHOT</mdsal.version>
     <karaf.distro.groupId>org.opendaylight.odlparent</karaf.distro.groupId>
     <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
     <karaf.distro.type>zip</karaf.distro.type>
@@ -34,8 +33,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
-        <version>${mdsal.version}</version>
+        <artifactId>controller-artifacts</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -46,7 +45,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>mdsal-it-base</artifactId>
-      <version>${mdsal.version}</version>
     </dependency>
 
     <!-- Dependencies for pax exam karaf container -->
index 6ff0f54..8a34fcb 100644 (file)
@@ -24,7 +24,7 @@
     <dependencies>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
-        <artifactId>mdsal-artifacts</artifactId>
+        <artifactId>controller-artifacts</artifactId>
         <version>1.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
index 9811212..fedde47 100644 (file)
@@ -15,7 +15,6 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>mdsal-artifacts</module>
     <module>parent</module>
 
     <!-- Common APIs & Implementation -->
diff --git a/pom.xml b/pom.xml
index d037ca1..fb86098 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
   <!-- Used by Sonar to set project name -->
 
   <modules>
+    <module>artifacts</module>
 
     <!-- md-sal -->
     <module>opendaylight/md-sal</module>

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.