Alias restconf-artifacts

Each project should provide a single artifacts file, this patch
unifies them in 'netconf-artifacts', making restconf-artifacts
only an alias for downstreams.

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

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index b3af82240fd21c6b0daf7b9a53211ec7d3a264ee..cdda3ec1c63a11fcc2fcceb7e17dc52d0e19dc51 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -441,6 +441,100 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+
+            <!-- RESTCONF -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-restconf</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>ietf-restconf-monitoring</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>restconf-common-models</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-common</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>restconf-nb-bierman02</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>restconf-nb-rfc8040</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-rest-connector-config</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-rest-docgen</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-rest-docgen-maven</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>sal-restconf-broker</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>websocket-client</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+            </dependency>
+
+            <!-- restconf features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-restconf</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-mdsal-apidocs</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-restconf</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-restconf-all</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-restconf-common</artifactId>
+                <version>1.11.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index 6591c859a7d7157d82d65a8baa8c954c9a2c74d2..8c5c791cf73261fe2931d097c3cb329d5828ef6e 100644 (file)
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -60,13 +60,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml
index 3cad9ae8038f5ac07c482bbeda2de613c095f265..d00b3cad43b5d2ffc2e9e10638054da32870a647 100644 (file)
--- a/features/restconf/odl-restconf-nb-bierman02/pom.xml
+++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml
@@ -34,8 +34,8 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.11.0-SNAPSHOT</version>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
index e19ecaa011180d1799a999a62f762d06f6f1cf2e..ef0b87f81c34dae53feff1050fcaca75d4acd932 100644 (file)
--- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml
+++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml
@@ -25,13 +25,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-artifacts</artifactId>

diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml
index e42a9c950d9b7763ca686fae04379052066d71f2..ba99c4edd1dee7e8beecca2154c328c4406fb747 100644 (file)
--- a/features/yanglib/odl-yanglib/pom.xml
+++ b/features/yanglib/odl-yanglib/pom.xml
@@ -32,13 +32,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>restconf-artifacts</artifactId>
-                <version>1.11.0-SNAPSHOT</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index 7a8c97eb70917b67692cba844983557e0f50ec74..a70690777874610a5b5d9259b1bb9243e9939f16 100644 (file)
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -26,95 +26,10 @@
         <dependencies>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>ietf-restconf-monitoring</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-common-models</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.opendaylight.netconf</groupId>
-              <artifactId>restconf-common</artifactId>
-              <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb-bierman02</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>restconf-nb-rfc8040</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-rest-connector-config</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-rest-docgen</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-rest-docgen-maven</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>sal-restconf-broker</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>websocket-client</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- restconf features -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-restconf</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-apidocs</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-all</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-restconf-common</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>1.8.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml
index fd246005f5f28afc8e5e41ba7cac3a20de5fe991..6cdfe3a542d56b6c373156e24602fb0ba87aa60d 100644 (file)
--- a/restconf/restconf-parent/pom.xml
+++ b/restconf/restconf-parent/pom.xml
@@ -44,23 +44,16 @@
         <scope>import</scope>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>netconf-artifacts</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>config-artifacts</artifactId>
+        <version>0.12.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
-        <artifactId>restconf-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>config-artifacts</artifactId>
-        <version>0.12.0-SNAPSHOT</version>
+        <artifactId>netconf-artifacts</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>