Changing to Amsterdam release version

Appc will be realeased as version 1.2.0 since version
1.1.0 already was created spring 2017.

Also changing ccsdk version to their released version.

Change-Id: I5e9864f8d506812ceab3b4b81a53be37c578a86e
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-id: APPC-314

8 files changed, 14 insertions, 27 deletions

diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml
index 7ed693c..1b7651c 100644
--- a/installation/appc/pom.xml
+++ b/installation/appc/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.openecomp.appc.deployment</groupId>
 		<artifactId>installation</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.appc.deployment</groupId>
 	<artifactId>installation-appc</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>Installation - APPC Docker</name>
 	<description>Creates APPC Docker container on top of the SDNC Base Docker Image</description>
diff --git a/installation/appc/src/main/docker/Dockerfile b/installation/appc/src/main/docker/Dockerfile
index 195ec4c..318145e 100644
--- a/installation/appc/src/main/docker/Dockerfile
+++ b/installation/appc/src/main/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-image:0.1-STAGING-latest
+FROM onap/ccsdk-odlsli-image:0.1.0
 MAINTAINER APP-C Team (appc@lists.openecomp.org)
 
 # Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
diff --git a/installation/pom.xml b/installation/pom.xml
index ad124c3..213416e 100644
--- a/installation/pom.xml
+++ b/installation/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.openecomp.appc.deployment</groupId>
 		<artifactId>appc-docker-project</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.appc.deployment</groupId>
 	<artifactId>installation</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>Installation</name>
 	<description>Installs APP-C on local file system</description>
diff --git a/platform-logic/appc/pom.xml b/platform-logic/appc/pom.xml
index 36938e1..4d93dae 100644
--- a/platform-logic/appc/pom.xml
+++ b/platform-logic/appc/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.openecomp.appc.deployment</groupId>
 		<artifactId>platform-logic</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.appc.deployment</groupId>
 	<artifactId>platform-logic-appc</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>Platform Logic : APP-C</name>
 	<description>Contains platform-level service logic for the APP-C Platform</description>
diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml
index b8f125d..b554ae8 100644
--- a/platform-logic/installer/pom.xml
+++ b/platform-logic/installer/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.openecomp.appc.deployment</groupId>
 		<artifactId>platform-logic</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.appc.deployment</groupId>
 	<artifactId>platform-logic-installer</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>Platform Logic Installer for APP-C</name>
 	<description>Contains platform-level service logic installer for APP-C</description>
diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml
index 067450a..39b7e3f 100644
--- a/platform-logic/pom.xml
+++ b/platform-logic/pom.xml
@@ -5,14 +5,14 @@
 	<parent>
 		<groupId>org.openecomp.appc.deployment</groupId>
 		<artifactId>appc-docker-project</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>pom</packaging>
 	<groupId>org.openecomp.appc.deployment</groupId>
 	<artifactId>platform-logic</artifactId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 
 	<name>Platform Logic</name>
 	<description>Contains platform-level service logic. Installs APP-C Directed Graphs during Docker instantiation.</description>
diff --git a/pom.xml b/pom.xml
index 989d345..416a6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-carbon-sr1</artifactId>
-        <version>0.0.2-SNAPSHOT</version>
+        <version>0.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
@@ -18,19 +18,6 @@
         <openecomp.nexus.url>https://${openecomp.nexus.host}/content</openecomp.nexus.url>
         <openecomp.nexus.snapshot-url>${openecomp.nexus.url}/repositories/snapshots/</openecomp.nexus.snapshot-url>
         <openecomp.nexus.release-url>${openecomp.nexus.url}/repositories/releases/</openecomp.nexus.release-url>
-
-        <!-- Setting absolute sdnc versions because the ranges defined in the sdnc root pom cause problems.
-             These values override those in the parent pom (org.openecomp.sdnc.core.root). -->
-        <sdnc.core.version>0.1.2-SNAPSHOT</sdnc.core.version>
-        <sdnc.adaptors.version>0.1.1-SNAPSHOT</sdnc.adaptors.version>
-        <sdnc.northbound.version>0.1.1-SNAPSHOT</sdnc.northbound.version>
-        <sdnc.oam.version>1.2.0-SNAPSHOT</sdnc.oam.version>
-        <sdnc.plugins.version>0.1.1-SNAPSHOT</sdnc.plugins.version>
-        <sdnctl.sli.version>${sdnc.core.version}</sdnctl.sli.version>
-        <sdnctl.aai.service.version>${sdnc.adaptors.version}</sdnctl.aai.service.version>
-        <sdnctl.dblib.version>${sdnc.core.version}</sdnctl.dblib.version>
-        <sdnctl.mdsal.resource.version>${sdnc.adaptors.version}</sdnctl.mdsal.resource.version>
-        <sdnctl.slipluginutils.version>${sdnc.core.version}</sdnctl.slipluginutils.version>
     </properties>
 
     <!-- ================================================================================== -->
@@ -137,5 +124,5 @@
     <organization>
         <name>OpenECOMP</name>
     </organization>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
 </project>
diff --git a/version.properties b/version.properties
index d6c9a49..a207c0a 100644
--- a/version.properties
+++ b/version.properties
@@ -25,7 +25,7 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 release_name=1
-sprint_number=1
+sprint_number=2
 feature_revision=0
 
 base_version=${release_name}.${sprint_number}.${feature_revision}