From d6e6de7e90c0da532ef68e783f1d4e77134031f4 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 15 Jul 2020 15:49:02 -0400 Subject: [PATCH] Roll snapshot version Roll to next El Alto snapshot version Change-Id: Id71688b6a4125be5b394cafaa6133202857ff15e Issue-ID: CCSDK-2541 Signed-off-by: Dan Timoney --- .gitignore | 3 +++ alpine/pom.xml | 4 ++-- ansible-server/pom.xml | 2 +- dependencies/pom.xml | 2 +- dgbuilder-docker/pom.xml | 4 ++-- dgbuilder/pom.xml | 4 ++-- odlsli/odlsli-alpine/pom.xml | 2 +- odlsli/pom.xml | 4 ++-- opendaylight/neon/neon-alpine/pom.xml | 4 ++-- opendaylight/neon/pom.xml | 4 ++-- opendaylight/pom.xml | 4 ++-- platform-logic/asdc-api/pom.xml | 4 ++-- platform-logic/installer/pom.xml | 4 ++-- platform-logic/oofpcipoc-api/pom.xml | 4 ++-- platform-logic/pom.xml | 4 ++-- platform-logic/restapi-templates/pom.xml | 4 ++-- platform-logic/sliapi/pom.xml | 4 ++-- pom.xml | 2 +- saltstack-server/pom.xml | 4 ++-- ubuntu/pom.xml | 4 ++-- ubuntu/src/main/docker/Dockerfile | 7 ------- version.properties | 2 +- 22 files changed, 38 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index f9801b8c..79b12a43 100755 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs .checkstyle maven-eclipse.xml workspace +.vscode ## Compilation Files ## *.class @@ -17,6 +18,8 @@ workspace target target-ide MANIFEST.MF +docs/__pycache__ +docs/_build ## Misc Ignores (OS specific etc) ## bin/ diff --git a/alpine/pom.xml b/alpine/pom.xml index 0de93551..81d18b5b 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-alpine - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: alpine diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index 3100ae5b..c81a16c0 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -11,7 +11,7 @@ pom org.onap.ccsdk.distribution ansible-server - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT ccsdk :: distribution :: ${project.artifactId} Creates ansible-server Docker container diff --git a/dependencies/pom.xml b/dependencies/pom.xml index ed3504dc..b09658f5 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.distribution dependencies - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution:: dependencies diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index f216d07f..a66ddc80 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder-docker - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: dgbuilder-docker diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index 36df3e49..5e1052b9 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT org.onap.ccsdk.distribution distribution-dgbuilder - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: dgbuilder diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index df2bb900..44212f4f 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.distribution distribution-odlsli-alpine - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: odlsli-alpine diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 3a92bd05..f6574879 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-odlsli - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: odlsli diff --git a/opendaylight/neon/neon-alpine/pom.xml b/opendaylight/neon/neon-alpine/pom.xml index 2bd86f24..70e6d89d 100644 --- a/opendaylight/neon/neon-alpine/pom.xml +++ b/opendaylight/neon/neon-alpine/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-odl-neon - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-odl-neon-alpine - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: opendaylight :: ${project.artifactId} diff --git a/opendaylight/neon/pom.xml b/opendaylight/neon/pom.xml index 9089170a..56b41ec0 100644 --- a/opendaylight/neon/pom.xml +++ b/opendaylight/neon/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-opendaylight - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-odl-neon - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index 40ff0bbe..e9c45bce 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-opendaylight - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index 62a1f859..e68cb80d 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT platform-logic-asdcapi - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index ee0adf10..08af1bc4 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT platform-logic-installer - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 90d58fd3..ca1f82d5 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT platform-logic-oofpcipocapi - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 8860666e..a28d6d6f 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 69fbe54b..c6a379c7 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT platform-logic-restapi-templates - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index bad80241..55d5b0e4 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-platform-logic - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT platform-logic-sliapi - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 5d5e560b..87c53d5e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index 593e6e90..dfde923f 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT saltstack-server - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: saltstack-server diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index adcc034c..467a4627 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -5,11 +5,11 @@ org.onap.ccsdk.distribution distribution-root - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT distribution-ubuntu - 0.6.3-SNAPSHOT + 0.6.4-SNAPSHOT pom ccsdk-distribution :: ubuntu diff --git a/ubuntu/src/main/docker/Dockerfile b/ubuntu/src/main/docker/Dockerfile index e2eb9b5a..0b535f65 100644 --- a/ubuntu/src/main/docker/Dockerfile +++ b/ubuntu/src/main/docker/Dockerfile @@ -2,14 +2,7 @@ FROM docker.io/ubuntu:16.04 MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -ARG HTTP_PROXY -ARG HTTPS_PROXY -ENV HTTP_PROXY ${HTTP_PROXY} -ENV HTTPS_PROXY ${HTTPS_PROXY} - -RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \ - if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi # Add tools needed for OpenDaylight RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip diff --git a/version.properties b/version.properties index 258a3baa..4616ea53 100644 --- a/version.properties +++ b/version.properties @@ -6,7 +6,7 @@ release_name=0 sprint_number=6 -feature_revision=3 +feature_revision=4 base_version=${release_name}.${sprint_number}.${feature_revision} -- 2.16.6