From 083a7eb21620467ae1f7d5ba9341e12f75f9cc41 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 19 Mar 2020 14:43:58 -0500 Subject: minor 2.1.20 changes Update versions to 2.1.20 Issue-ID: AAF-1081 Signed-off-by: Instrumental Change-Id: I1a8706d87f7aceffcc96980cebea6722d20cf11e --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java | 4 ---- auth/auth-cass/cass_init/cmd.sh | 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/d.props.init | 2 +- auth/docker/pom.xml | 2 +- auth/helm/aaf-hello/values.yaml | 4 ++-- auth/helm/aaf/values.yaml | 4 ++-- 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 | 2 +- 32 files changed, 33 insertions(+), 37 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index 8c7d0c24..b011a586 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index cb44ea38..f3f0e5c3 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java index 3058ddc5..983ef819 100644 --- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java +++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java @@ -501,7 +501,6 @@ public abstract class Batch { if (cls != null) { Constructor cnst = cls.getConstructor(AuthzTrans.class); batch = (Batch) cnst.newInstance(trans); - System.out.println(batch.getClass().getCanonicalName()); env.info().log("Begin", classifier, toolName); } @@ -516,9 +515,6 @@ public abstract class Batch { } if (batch != null) { try { - for(String s : batchArgs) { - System.out.println(s); - } batch.run(trans); } catch (Exception e) { trans.error().log(e); diff --git a/auth/auth-cass/cass_init/cmd.sh b/auth/auth-cass/cass_init/cmd.sh index d9120872..7569440f 100644 --- a/auth/auth-cass/cass_init/cmd.sh +++ b/auth/auth-cass/cass_init/cmd.sh @@ -117,7 +117,7 @@ function install_cql { echo "" echo "The following will give you a temporary identity with which to start working, or emergency" echo " cqlsh -f temp_identity.cql" - echo "casablanca" > $INSTALLED_VERSION + echo "frankfurt" > $INSTALLED_VERSION else echo "Cassandra DB already includes 'authz' keyspace" fi diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index f346826a..bd51b861 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index d44840b8..0adce9cc 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 01fa56c1..de573f11 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 5c4cd00d..453b0deb 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index b2822b35..52b34ab0 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.19-SNAPSHOT + 2.1.20-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index f0095d0f..df18b23a 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 956cf661..6eaced2e 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 1d95f29a..a93bd2f9 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 9de3dfaf..0d801922 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 90774daf..ee08689a 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 31d4aa7c..26fc7c74 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index b65c5de9..ebc550a5 100644 --- a/auth/docker/d.props.init +++ b/auth/docker/d.props.init @@ -23,7 +23,7 @@ PROJECT=aaf # Note: Override can happen on dbuild.sh Commandline, -r DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.19-SNAPSHOT +VERSION=2.1.20-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index 630a8695..4afd8e6b 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT ../pom.xml diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml index dd4735ff..d907fcbe 100644 --- a/auth/helm/aaf-hello/values.yaml +++ b/auth/helm/aaf-hello/values.yaml @@ -37,8 +37,8 @@ image: # repository: localhost:5000/ service: - agentImage: onap/aaf/aaf_agent:2.1.19-SNAPSHOT - image: onap/aaf/aaf_hello:2.1.19-SNAPSHOT + agentImage: onap/aaf/aaf_agent:2.1.20-SNAPSHOT + image: onap/aaf/aaf_hello:2.1.20-SNAPSHOT app_ns: "org.osaaf.aaf" fqi: "aaf@aaf.osaaf.org" fqdn: "aaf-hello" diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index 8b875be6..4a023295 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -31,7 +31,7 @@ image: # When using Docker Repo, add, and include trailing "/" # For Released Versions (both Repo and remove "-SNAPSHOT" from version) # repository: nexus3.onap.org:10001/ - # version: 2.1.19 + # version: 2.1.20 ### FOR SNAPSHOTS, DEVELOPMENT, ETC ### # When using Locally built images, comment out "repository" @@ -40,7 +40,7 @@ image: # repository: localhost:5000/ # When using locally built Docker Container, set Repository to "" repository: "" - version: 2.1.19-SNAPSHOT + version: 2.1.20-SNAPSHOT services: aaf_env: "DEV" diff --git a/auth/pom.xml b/auth/pom.xml index b1976270..9553ba41 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 991d4d84..60d9c658 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 688c22ba..ea483e93 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index f78d434c..e79dba27 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 2f966d58..e3abc56c 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index abf50236..40c04817 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index c1df9bf7..e4212944 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 420e4b74..962c22bc 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 9d1827fa..d734cf7e 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 44d3af90..1993a6cb 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 0b14ac1c..1a4ab7ba 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 48b1b873..46face06 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 9e47ff07..f3ee5c18 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.1.19-SNAPSHOT + 2.1.20-SNAPSHOT aaf-authz pom -- cgit 1.2.3-korg