From ea8c76cca7dbc83aff1c73d1b7bf4b00597e42ae Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Thu, 9 Nov 2017 11:53:06 -0800 Subject: [PATCH] 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 Issue-id: APPC-314 --- installation/appc/pom.xml | 4 ++-- installation/appc/src/main/docker/Dockerfile | 2 +- installation/pom.xml | 4 ++-- platform-logic/appc/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- pom.xml | 17 ++--------------- version.properties | 2 +- 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 @@ org.openecomp.appc.deployment installation - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom org.openecomp.appc.deployment installation-appc - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT Installation - APPC Docker Creates APPC Docker container on top of the SDNC Base Docker Image 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 @@ org.openecomp.appc.deployment appc-docker-project - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom org.openecomp.appc.deployment installation - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT Installation Installs APP-C on local file system 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 @@ org.openecomp.appc.deployment platform-logic - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom org.openecomp.appc.deployment platform-logic-appc - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic : APP-C Contains platform-level service logic for the APP-C Platform 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 @@ org.openecomp.appc.deployment platform-logic - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom org.openecomp.appc.deployment platform-logic-installer - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic Installer for APP-C Contains platform-level service logic installer for APP-C 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 @@ org.openecomp.appc.deployment appc-docker-project - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 4.0.0 pom org.openecomp.appc.deployment platform-logic - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT Platform Logic Contains platform-level service logic. Installs APP-C Directed Graphs during Docker instantiation. diff --git a/pom.xml b/pom.xml index 989d345..416a6c5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.onap.ccsdk.parent odlparent-carbon-sr1 - 0.0.2-SNAPSHOT + 0.1.0 4.0.0 pom @@ -18,19 +18,6 @@ https://${openecomp.nexus.host}/content ${openecomp.nexus.url}/repositories/snapshots/ ${openecomp.nexus.url}/repositories/releases/ - - - 0.1.2-SNAPSHOT - 0.1.1-SNAPSHOT - 0.1.1-SNAPSHOT - 1.2.0-SNAPSHOT - 0.1.1-SNAPSHOT - ${sdnc.core.version} - ${sdnc.adaptors.version} - ${sdnc.core.version} - ${sdnc.adaptors.version} - ${sdnc.core.version} @@ -137,5 +124,5 @@ OpenECOMP - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT 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} -- 2.16.6