Prepare for release build

Remove -STAGING from release version and remove SNAPSHOT dependencies

Change-Id: I2d10dea846bcdccf999ac34026a8c8b8677af4f1
Issue-ID: CCSDK-597
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml
index 4915b6c..5cbc3ec 100644 (file)
--- a/ansible-server/pom.xml
+++ b/ansible-server/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -19,6 +19,7 @@
     <properties>
         <image.name>onap/ccsdk-ansible-server-image</image.name>
         <ccsdk.project.version>${project.version}</ccsdk.project.version>
+       <ccsdk.distribution.version>${project.version}</ccsdk.distribution.version>
         <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
     </properties>

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 7542bde..295f793 100755 (executable)
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/odlsli/pom.xml b/odlsli/pom.xml
index 2fbe8c0..35514c2 100644 (file)
--- a/odlsli/pom.xml
+++ b/odlsli/pom.xml
@@ -7,7 +7,7 @@
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
                <artifactId>odlparent-lite</artifactId>
-               <version>1.1.0-SNAPSHOT</version>
+               <version>1.1.0</version>
                <relativePath />
        </parent>
 

diff --git a/pom.xml b/pom.xml
index 902b70c..de070d1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
+       <?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.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
     </parent>
 
     <groupId>org.onap.ccsdk.distribution</groupId>

diff --git a/version.properties b/version.properties
index 4c1c6c6..31723e3 100644 (file)
--- 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