Centralize artifacts

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>

diff --git a/opendaylight/md-sal/mdsal-artifacts/pom.xml b/artifacts/pom.xml
similarity index 84%
rename from opendaylight/md-sal/mdsal-artifacts/pom.xml
rename to artifacts/pom.xml
index 6361ef7434d5d10c106b93ffd7c8940ee8d324c5..e8b2c0f09811cd6e6ac1a08f443ae3ebf74ca211 100644 (file)
--- a/opendaylight/md-sal/mdsal-artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -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>
 
@@ -45,6 +45,12 @@
                 <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>
@@ -55,14 +61,6 @@
                 <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>
@@ -319,6 +317,56 @@
                 <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
--- a/benchmark/artifacts/pom.xml
+++ /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>

diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml
index 1dae6f65e6c04d656fab0b40eab2211d05660ede..b04da8ea94db94b89f30afeef89795aa758fdb76 100644 (file)
--- a/benchmark/dsbenchmark/pom.xml
+++ b/benchmark/dsbenchmark/pom.xml
@@ -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>

diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml
index c88d68752b882c5190ff4a50153a24eca02867d5..f992bbe41d9758f14d489d9da7cfe943a0e0a877 100644 (file)
--- a/benchmark/ntfbenchmark/pom.xml
+++ b/benchmark/ntfbenchmark/pom.xml
@@ -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>

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index f9ec2fd058ccb6c40d5def06dd997e264074f7d2..7b92fd4c3d8f95fad55d3e3b9c898bbd678371db 100644 (file)
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -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>

diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml
index d85422f521581634839dcfba51bcae4dfc46a009..a62d98d39c90ccd1a801f538db079cce8a0f0152 100644 (file)
--- a/benchmark/rpcbenchmark/pom.xml
+++ b/benchmark/rpcbenchmark/pom.xml
@@ -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>

diff --git a/docs/pom.xml b/docs/pom.xml
index 91ce0e12ea1dc60d3fea1cf0489e5217a99d789d..fbc24a7b8961e74c6b53f660d9d973822accab99 100644 (file)
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -27,14 +27,7 @@
         <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>

diff --git a/features/config-netty/odl-config-netty/pom.xml b/features/config-netty/odl-config-netty/pom.xml
index 11eaf17ee580554d4bcbe27e9e303360a48e2f89..7419a06671cc2798e5ca2b819499b3d159ac3cc5 100644 (file)
--- a/features/config-netty/odl-config-netty/pom.xml
+++ b/features/config-netty/odl-config-netty/pom.xml
@@ -27,14 +27,7 @@
         <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>

diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml
index e5a3241f1c22c42a601def5d77a8531e65694910..db96d7847dbf496fb7090deb4301cca57a7721a9 100644 (file)
--- a/features/mdsal/odl-controller-mdsal-common/pom.xml
+++ b/features/mdsal/odl-controller-mdsal-common/pom.xml
@@ -32,6 +32,13 @@
                 <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>
 

diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml
index 986b0b7198fe323cc64b0bffd2cecdbe1c33196a..24a949e91431ea82629fae803b023e312888e3a6 100644 (file)
--- a/features/mdsal/odl-controller-model-topology/pom.xml
+++ b/features/mdsal/odl-controller-model-topology/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index 3bcc08bc9c58ae37c688af44fd981a9b4d3d8071..70be4d908a7ff17da0579dc485bad9b591fe2b59 100644 (file)
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml
index 7fd05683322dd9973c6d347f8c04ffd9092f03bf..a2a8b945a9cad3c9f1d247ff7cc20394f189b205 100644 (file)
--- a/features/mdsal/odl-mdsal-broker/pom.xml
+++ b/features/mdsal/odl-mdsal-broker/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
index 97e1ed95257f6766b76c3c1c53425eed0dc56c12..e047b953d119f0d2023eb1265eabcc9e0dde9315 100644 (file)
--- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
+++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml
index 9c618e2b200133d607ffd6d2d4e4884624caa603..37b7cc81f2977d68be1329e02a4b2e848572eb49 100644 (file)
--- a/features/mdsal/odl-mdsal-model-inventory/pom.xml
+++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
index 95540f66549f6417f4055c1a7726294a21e69dac..a2d1743e586a458a771d28b10895ebb0d4d21b91 100644 (file)
--- a/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
+++ b/features/mdsal/odl-mdsal-remoterpc-connector/pom.xml
@@ -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>

diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml
index 6e5bd4e11e4bb58a4ac71ceeb238aa6ea60fce4e..0d12710477e86dc2e63db52e8fba7542a388d809 100644 (file)
--- a/features/mdsal/odl-message-bus-collector/pom.xml
+++ b/features/mdsal/odl-message-bus-collector/pom.xml
@@ -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>

diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 98cb037766ac172c9be13cf326c3a498b4c2577a..8a2cf1fb2be0aecf3cc915a4610d9425302075b0 100644 (file)
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -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
--- a/opendaylight/config/config-artifacts/pom.xml
+++ /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>
-

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 3cac66fb357e7f3ec0646e6028d1d3ca0e8f61c8..ec7e8c58ee7d25d4a1f5b25b1e4521084914b916 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -22,15 +22,14 @@
     <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>

diff --git a/opendaylight/md-sal/mdsal-it-base/pom.xml b/opendaylight/md-sal/mdsal-it-base/pom.xml
index 946065ce0819ed6326b1e7c4cdb6b6ea36a8097a..be18eff8329b8e35b4b1bdcdd8adade21b033243 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-base/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-base/pom.xml
@@ -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>

diff --git a/opendaylight/md-sal/mdsal-it-parent/pom.xml b/opendaylight/md-sal/mdsal-it-parent/pom.xml
index 72eb79c886e370b917fcf9104f8a557bdebc2747..74bf6c9e0e2c0cab2cd8dcb384a8995ba0e7aaee 100644 (file)
--- a/opendaylight/md-sal/mdsal-it-parent/pom.xml
+++ b/opendaylight/md-sal/mdsal-it-parent/pom.xml
@@ -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 -->

diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml
index 6ff0f54b9d1f1c86d3ee56add5fa4608a5ca9fcf..8a34fcb05ff655497ee7ac83563f8046cdd70d21 100644 (file)
--- a/opendaylight/md-sal/parent/pom.xml
+++ b/opendaylight/md-sal/parent/pom.xml
@@ -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>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 9811212658b3e443b6c6d153e366141b55f61181..fedde47ff36971f7eb044698e000b062f1e77e16 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -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 d037ca1b06fc8db77f76e20d05f4ed67b6356254..fb860984f5384f3edea53737d9ee7c81c575970c 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>