Move netconf-artifacts

Each project should be exposing only a single set of artifacts, so
that it's "release" version is consistent across all build entrypoints.

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

diff --git a/netconf/netconf-artifacts/pom.xml b/artifacts/pom.xml
similarity index 99%
rename from netconf/netconf-artifacts/pom.xml
rename to artifacts/pom.xml
index e73bc5dd7accfbbc4921741e58121824cc9e13ad..b3af82240fd21c6b0daf7b9a53211ec7d3a264ee 100644 (file)
--- a/netconf/netconf-artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -23,10 +23,6 @@
     <version>1.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <properties>
-        <mdsal.version>1.11.0-SNAPSHOT</mdsal.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -114,7 +110,7 @@
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>sal-netconf-connector</artifactId>
-                <version>${mdsal.version}</version>
+                <version>1.11.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/netconf/pom.xml b/netconf/pom.xml
index aafd9dc0ce3de3a96507d432af1decfd19a33d15..9612a73d38df3c378e34311d6ee757b658f1b9d5 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -61,8 +61,6 @@
     <module>callhome-protocol</module>
     <module>callhome-provider</module>
 
-    <module>netconf-artifacts</module>
-
     <module>shaded-exificient-jar</module>
     <module>shaded-exificient</module>
   </modules>

diff --git a/pom.xml b/pom.xml
index 69049aa313eb5b26772de4ca60296c9eb8b7dff5..b5ef338decd249cb363fabfae6073f68f373f17c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
     </properties>
 
     <modules>
+        <module>artifacts</module>
         <module>features</module>
         <module>karaf</module>
         <module>netconf</module>