From 13b7a3bc25fba512024f2e599be3eb132b0c7b16 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 14 Mar 2019 13:36:18 -0500 Subject: [PATCH] Change version to 2.1.11-SNAPSHOT Issue-ID: AAF-788 Change-Id: I3d98d495e4258d551bd6ab7b7455cfd052c3f239 Signed-off-by: Instrumental --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/agent.sh | 2 +- auth/docker/d.props.init | 2 +- auth/helm/aaf/values.yaml | 2 +- auth/pom.xml | 2 +- cadi/aaf/pom.xml | 2 +- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 2 +- cadi/pom.xml | 2 +- cadi/servlet-sample/pom.xml | 2 +- misc/env/pom.xml | 2 +- misc/log4j/pom.xml | 2 +- misc/pom.xml | 2 +- misc/rosetta/pom.xml | 2 +- misc/xgen/pom.xml | 2 +- pom.xml | 10 ++-------- version.properties | 4 ++-- 30 files changed, 32 insertions(+), 38 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index 5c322182..ca95e00d 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index fb32d2de..18f86700 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index c43a6965..f5192e2c 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index ba346e6f..e97c414c 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index c0169e57..acff60cb 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index a4b01cd9..1db9ec65 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 63bcb9b5..db940bac 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ authparent ../pom.xml org.onap.aaf.authz - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 5b37469a..815bd7aa 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 63a652b1..40a9924c 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index dfb77a39..194b8cbf 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 40457cab..ac0cadbe 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 62fb3f76..47a64f41 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index bc7d2794..c0f7c2ca 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT ../pom.xml diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index 4be485b8..ce878f58 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -28,7 +28,7 @@ fi . ./aaf.props DOCKER=${DOCKER:=docker} -CADI_VERSION=${CADI_VERSION:=2.1.10-SNAPSHOT} +CADI_VERSION=${CADI_VERSION:=2.1.11-SNAPSHOT} for V in VERSION DOCKER_REPOSITORY HOSTNAME CONTAINER_NS AAF_FQDN AAF_FQDN_IP DEPLOY_FQI APP_FQDN APP_FQI VOLUME DRIVER LATITUDE LONGITUDE; do if [ "$(grep $V ./aaf.props)" = "" ]; then diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index bc5d3583..54a3926d 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -21,7 +21,7 @@ ORG=onap PROJECT=aaf DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.10-SNAPSHOT +VERSION=2.1.11-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index 9e344dfa..2deb76ee 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -67,7 +67,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.10-SNAPSHOT + version: 2.1.11-SNAPSHOT resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/auth/pom.xml b/auth/pom.xml index f8b7c122..37bfc85e 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 25a2d02d..bd2a933c 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index b27d37c4..ef1165b7 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index c02d0f84..491e931d 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index d04e12b5..9cef1bb4 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index 7e7458a6..ee82f229 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index ca441079..5fee452f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 2c8d4207..e042af9c 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 0621305d..d4ec3f9e 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 89e7e2b8..f16a593c 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 2cf38a34..51f7d608 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index c2042cf8..59a6ed53 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 67b1e21b..185d51c2 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,14 @@ 4.0.0 org.onap.aaf.authz parent - 2.1.10-SNAPSHOT + 2.1.11-SNAPSHOT aaf-authz pom org.onap.oparent oparent - 1.2.1 + 2.0.0 @@ -176,12 +176,6 @@ ${project.version} - - - - - - org.onap.aaf.authz aaf-auth-client diff --git a/version.properties b/version.properties index cada72b1..e945821b 100644 --- a/version.properties +++ b/version.properties @@ -24,10 +24,10 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support -# This TAG 2.1.10 is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG 2.1.11-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=1 -patch=10 +patch=11 base_version=${major}.${minor}.${patch} -- 2.16.6