From: Bin Yang Date: Fri, 27 Sep 2019 02:14:32 +0000 (+0000) Subject: Bump version after releasing 1.4.1 X-Git-Tag: 1.4.2~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=cba35332711747a9af0f8bf8412f88fadf5e93e3;ds=sidebyside Bump version after releasing 1.4.1 Issue-ID: MULTICLOUD-808 Signed-off-by: Bin Yang Change-Id: I1de9ee3ab269a6027378b9c661858833af5e22e7 --- diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 14b5c5f..ab64c20 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index f908470..4adcf9c 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index 6925640..853f1dd 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/docker/build_image.sh b/artifactbroker/packages/docker/build_image.sh index d483658..00e78a2 100755 --- a/artifactbroker/packages/docker/build_image.sh +++ b/artifactbroker/packages/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.4.1-SNAPSHOT" -STAGING_VERSION="1.4.1-STAGING" +VERSION="1.4.2-SNAPSHOT" +STAGING_VERSION="1.4.2-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index 8486d05..b8badb8 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 9a6e831..2b5421c 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 1ca3e00..2e832e6 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 33a3749..d7b81e1 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 5b3c1f2..856239f 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -17,12 +17,12 @@ org.onap.multicloud.framework multicloud-framework - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 825f34f..da242c2 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index 8ea1401..bb11484 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.4.1-SNAPSHOT" -STAGING_VERSION="1.4.1-STAGING" +VERSION="1.4.2-SNAPSHOT" +STAGING_VERSION="1.4.2-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index 819a602..45571e0 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -18,12 +18,12 @@ org.onap.multicloud.framework multicloud-framework - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/multivimbroker/tox.ini b/multivimbroker/tox.ini index fe4e065..83cf1d9 100644 --- a/multivimbroker/tox.ini +++ b/multivimbroker/tox.ini @@ -1,11 +1,15 @@ [tox] -envlist = py36,pep8 +envlist = py36,pep8,cover skipsdist = true [tox:jenkins] downloadcache = ~/cache/pip [testenv] +basepython = + py36: python3 + pep8: python3 + cover: python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -18,9 +22,9 @@ commands = deps=flake8 commands=flake8 -[testenv:py27] -commands = - {[testenv]commands} +# [testenv:py27] +# commands = +# {[testenv]commands} [testenv:cover] setenv= diff --git a/pom.xml b/pom.xml index 50e06f8..89cd95e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.4.1-SNAPSHOT + 1.4.2-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 7694f9c..e14a020 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=4 -patch=1 +patch=2 base_version=${major}.${minor}.${patch}