From ea65269f135a9196b0dfcc6195d6a9bd915f998c Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Tue, 8 Jan 2019 15:56:26 -0500
Subject: [PATCH] Prepare for release build

Prepare for release of early ODL-Oxygen based CCSDK Dublin

Change-Id: I8f725533def2c2bec8e37af86ee2657d125a50e0
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 ansible-server/pom.xml                        |  5 +-
 dependencies/pom.xml                          |  5 +-
 odlsli/odlsli-alpine/pom.xml                  |  8 +--
 odlsli/odlsli-ubuntu/pom.xml                  |  8 +--
 opendaylight/fluorine/fluorine-alpine/pom.xml |  2 +-
 opendaylight/fluorine/fluorine-ubuntu/pom.xml |  2 +-
 opendaylight/oxygen/oxygen-alpine/pom.xml     |  2 +-
 opendaylight/oxygen/oxygen-ubuntu/pom.xml     |  2 +-
 pom.xml                                       | 96 +++++++++++++--------------
 version.properties                            |  2 +-
 10 files changed, 62 insertions(+), 70 deletions(-)

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 5948d315..4ea5ae3c 100644
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -1,11 +1,10 @@
 <?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/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index cd85558c..6e41e26c 100755
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -1,12 +1,11 @@
 <?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/xsd/maven-4.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.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <relativePath/>
     </parent>
 
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index c971da23..eef7fc08 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -1,14 +1,12 @@
 <?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/xsd/maven-4.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.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath />
+		<version>1.2.0</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index ba6ad07d..fb5209f4 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -1,14 +1,12 @@
 <?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/xsd/maven-4.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.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath />
+		<version>1.2.0</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.distribution</groupId>
diff --git a/opendaylight/fluorine/fluorine-alpine/pom.xml b/opendaylight/fluorine/fluorine-alpine/pom.xml
index 7bcd5934..dc7e96cd 100644
--- a/opendaylight/fluorine/fluorine-alpine/pom.xml
+++ b/opendaylight/fluorine/fluorine-alpine/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-opendaylight</artifactId>
+        <artifactId>distribution-odl-fluorine</artifactId>
         <version>0.4.0-SNAPSHOT</version>
     </parent>
 
diff --git a/opendaylight/fluorine/fluorine-ubuntu/pom.xml b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
index 0d5fdca0..da85bf1e 100644
--- a/opendaylight/fluorine/fluorine-ubuntu/pom.xml
+++ b/opendaylight/fluorine/fluorine-ubuntu/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-opendaylight</artifactId>
+        <artifactId>distribution-odl-fluorine</artifactId>
         <version>0.4.0-SNAPSHOT</version>
     </parent>
 
diff --git a/opendaylight/oxygen/oxygen-alpine/pom.xml b/opendaylight/oxygen/oxygen-alpine/pom.xml
index 8746f892..a6ef2484 100644
--- a/opendaylight/oxygen/oxygen-alpine/pom.xml
+++ b/opendaylight/oxygen/oxygen-alpine/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-opendaylight</artifactId>
+        <artifactId>distribution-odl-oxygen</artifactId>
         <version>0.4.0-SNAPSHOT</version>
     </parent>
 
diff --git a/opendaylight/oxygen/oxygen-ubuntu/pom.xml b/opendaylight/oxygen/oxygen-ubuntu/pom.xml
index f0b7a004..7756b304 100644
--- a/opendaylight/oxygen/oxygen-ubuntu/pom.xml
+++ b/opendaylight/oxygen/oxygen-ubuntu/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.distribution</groupId>
-        <artifactId>distribution-opendaylight</artifactId>
+        <artifactId>distribution-odl-oxygen</artifactId>
         <version>0.4.0-SNAPSHOT</version>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 812dc72f..0d30ea26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,57 +1,55 @@
-	<?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/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<?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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.0</version>
+    </parent>
 
-	<groupId>org.onap.ccsdk.distribution</groupId>
-	<artifactId>distribution-root</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.distribution</groupId>
+    <artifactId>distribution-root</artifactId>
+    <version>0.4.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ccsdk-distribution</name>
-	<description>Creates distributuon bundles for CCSDK</description>
+    <name>ccsdk-distribution</name>
+    <description>Creates distributuon bundles for CCSDK</description>
 
-	<modules>
-		<module>platform-logic</module>
-		<module>dependencies</module>
-		<module>alpine</module>
-		<module>ubuntu</module>
-		<module>opendaylight</module>
-		<module>odlsli</module>
-		<module>dgbuilder</module>
-		<module>dgbuilder-docker</module>
-		<module>ansible-server</module>
-	</modules>
+    <modules>
+        <module>platform-logic</module>
+        <module>dependencies</module>
+        <module>alpine</module>
+        <module>ubuntu</module>
+        <module>opendaylight</module>
+        <module>odlsli</module>
+        <module>dgbuilder</module>
+        <module>dgbuilder-docker</module>
+        <module>ansible-server</module>
+    </modules>
 
-	<properties>
-		<application.name>distribution</application.name>
+    <properties>
+        <application.name>distribution</application.name>
 
-		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
-		<build.number>${maven.build.timestamp}</build.number>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-	</properties>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+        <build.number>${maven.build.timestamp}</build.number>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>https://${onap.nexus.host}</nexusUrl>
-					<stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-					<serverId>${onap.nexus.staging.server-id}</serverId>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+        <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.7</version>
+            <extensions>true</extensions>
+            <configuration>
+            <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+            <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+            <serverId>${onap.nexus.staging.server-id}</serverId>
+            </configuration>
+        </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/version.properties b/version.properties
index aa6328e0..ffee02fc 100644
--- a/version.properties
+++ b/version.properties
@@ -10,6 +10,6 @@ feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
-release_version=${base_version}-STAGING
+release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
 
-- 
2.16.6