Create nitrogen dockers

Updated dockers to install Nitrogen artifacts.

Change-Id: I9710346f064fa5fff0d92b5d6de32cc84d9e1b3d
Issue-ID: CCSDK-179
Signed-off-by: Dan Timoney <dtimoney@att.com>

3 files changed, 27 insertions, 32 deletions

diff --git a/opendaylight/carbon/pom.xml b/opendaylight/carbon/pom.xml
index aab4f8e3..764598b5 100644
--- a/opendaylight/carbon/pom.xml
+++ b/opendaylight/carbon/pom.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.distribution</groupId>
     <artifactId>distribution-odl-carbon</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Distribution - opendaylight</name>
+    <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
     <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>openECOMP</name>
+    </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-image</image.name>
+        <image.name>onap/ccsdk-odl-carbon-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.opendaylight.version>0.6.1-Carbon</ccsdk.opendaylight.version>
         <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
@@ -160,7 +163,6 @@
 
 
         </plugins>
-
     </build>
 
     <profiles>
@@ -215,8 +217,4 @@
         </profile>
 
     </profiles>
-    <organization>
-        <name>openECOMP</name>
-    </organization>
-    <groupId>org.onap.ccsdk.distribution</groupId>
 </project>
diff --git a/opendaylight/nitrogen/pom.xml b/opendaylight/nitrogen/pom.xml
index b14b1603..4eb2134c 100644
--- a/opendaylight/nitrogen/pom.xml
+++ b/opendaylight/nitrogen/pom.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-opendaylight</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <artifactId>distribution-odl-nitrogen</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Distribution - opendaylight</name>
+    <name>ccsdk-distribution :: opendaylight :: ${project.artifactId}</name>
     <description>Creates OpenDaylight container</description>
+    <organization>
+        <name>ONAP</name>
+    </organization>
 
     <properties>
-        <image.name>onap/ccsdk-odl-nitrogen-image</image.name>
+        <image.name>onap/ccsdk-odl-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
         <ccsdk.opendaylight.version>0.7.1</ccsdk.opendaylight.version>
         <ccsdk.mariadb-connector-java.version>2.1.1</ccsdk.mariadb-connector-java.version>
@@ -161,7 +163,6 @@
 
 
         </plugins>
-
     </build>
 
     <profiles>
@@ -216,7 +217,4 @@
         </profile>
 
     </profiles>
-    <organization>
-        <name>ONAP</name>
-    </organization>
 </project>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 46d98bf5..d7cc1ed3 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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.onap.ccsdk.distribution</groupId>
         <artifactId>distribution-root</artifactId>
-        <version>0.2.0-SNAPSHOT</version>
+        <version>0.2.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
     <artifactId>distribution-opendaylight</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.2.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <name>Distribution - opendaylight</name>
+    <name>ccsdk-distribution :: opendaylight</name>
     <description>Creates OpenDaylight container</description>
 
     <modules>