From 4d0a045d78b8ad411534888464d977f65ff9efc7 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Thu, 14 Nov 2019 12:14:16 -0600 Subject: [PATCH] To version 2.1.17-SNAPSHOT Issue-ID: AAF-1046 Change-Id: Id534c271c94c3805a5902eea521dc6c9d66f3919 Signed-off-by: Instrumental --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 8 +------- auth/auth-batch/src/assemble/auth-batch.xml | 13 +++++++++++++ auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-cmd/src/assemble/auth-cmd.xml | 4 ++++ 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/Dockerfile.base | 3 +++ auth/docker/agent.sh | 3 ++- auth/docker/d.props.csit | 2 +- auth/docker/d.props.init | 2 +- auth/docker/dclean.sh | 2 +- auth/docker/pom.xml | 2 +- auth/helm/.gitignore | 3 +++ auth/helm/aaf-hello/values.yaml | 4 ++-- auth/helm/aaf/Chart.yaml | 2 +- auth/helm/aaf/values.yaml | 2 +- auth/pom.xml | 2 +- auth/sample/bin/client.sh | 2 +- auth/sample/bin/service.sh | 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 | 19 +++++++++++++++++-- misc/xgen/pom.xml | 2 +- pom.xml | 27 +++++++++++++++++++++++++-- version.properties | 4 ++-- 41 files changed, 103 insertions(+), 47 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index c404ab1f..c0178b7b 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index 802538ab..6b5d21c6 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml @@ -123,12 +123,6 @@ org.onap.aaf.authz aaf-auth-deforg - - - diff --git a/auth/auth-batch/src/assemble/auth-batch.xml b/auth/auth-batch/src/assemble/auth-batch.xml index 1ba34da3..25b37b73 100644 --- a/auth/auth-batch/src/assemble/auth-batch.xml +++ b/auth/auth-batch/src/assemble/auth-batch.xml @@ -38,7 +38,20 @@ org.onap.aaf.authz:aaf-cadi-core org.onap.aaf.authz:aaf-misc-env org.onap.aaf.authz:aaf-misc-rosetta + javax.xml.bind:jaxb-api + org.glassfish.jaxb:jaxb-runtime + + org.onap.aaf.authz:aaf-auth-batch + org.onap.aaf.authz:aaf-auth-core + org.onap.aaf.authz:aaf-cadi-core + org.onap.aaf.authz:aaf-misc-env + org.onap.aaf.authz:aaf-misc-rosetta + javax.xml.bind:jaxb-api + org.glassfish.jaxb:jaxb-runtime + com.sun.istack:istack-commons-runtime + javax.activation:javax.activation-api + \ No newline at end of file diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index d8e25cc3..11d759c2 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index 69465b7d..64ab8372 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 6de09de5..76035309 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/src/assemble/auth-cmd.xml b/auth/auth-cmd/src/assemble/auth-cmd.xml index 013010b5..ba312423 100644 --- a/auth/auth-cmd/src/assemble/auth-cmd.xml +++ b/auth/auth-cmd/src/assemble/auth-cmd.xml @@ -42,6 +42,10 @@ org.onap.aaf.authz:aaf-misc-env org.onap.aaf.authz:aaf-misc-rosetta jline:jline + javax.xml.bind:jaxb-api + org.glassfish.jaxb:jaxb-runtime + com.sun.istack:istack-commons-runtime + javax.activation:javax.activation-api diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 91517836..01001c91 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 353d4b91..3d1eb9aa 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.16-SNAPSHOT + 2.1.17-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 7b871267..0d7b6dc1 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 6b003051..f93fb7e4 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 2cb8f571..47285766 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 3ea432b8..8df23909 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 5e0c56fb..cc0ed53e 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 63585f94..9f9ca869 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/docker/Dockerfile.base b/auth/docker/Dockerfile.base index e7ae6432..4874f1aa 100644 --- a/auth/docker/Dockerfile.base +++ b/auth/docker/Dockerfile.base @@ -19,6 +19,9 @@ # # Use dbuild.sh input parameter to set registry FROM ${REGISTRY}/openjdk:8-jre-alpine +#FROM openjdk:12-jdk-alpine +#FROM openjdk:13-jdk-alpine + MAINTAINER AAF Team, AT&T 2018 LABEL description="aaf_base" diff --git a/auth/docker/agent.sh b/auth/docker/agent.sh index 575e21f9..f59bd228 100644 --- a/auth/docker/agent.sh +++ b/auth/docker/agent.sh @@ -28,7 +28,8 @@ fi . ./aaf.props DOCKER=${DOCKER:=docker} -CADI_VERSION=${CADI_VERSION:=2.1.16} +VERSION=${VERSION} +CADI_VERSION=${CADI_VERSION:=${VERSION}} 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.csit b/auth/docker/d.props.csit index cdb6b5a0..27f539bb 100644 --- a/auth/docker/d.props.csit +++ b/auth/docker/d.props.csit @@ -28,7 +28,7 @@ ORG=onap PROJECT=aaf DOCKER_PULL_REGISTRY=nexus3.onap.org:10001 DOCKER_REPOSITORY=nexus3.onap.org:10003 -VERSION=2.1.16-SNAPSHOT +VERSION=2.1.17-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/docker/d.props.init b/auth/docker/d.props.init index 41a30244..8ef2e31a 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.16-SNAPSHOT +VERSION=2.1.17-SNAPSHOT CONF_ROOT_DIR=/opt/app/osaaf # For local builds, set PREFIX= PREFIX="$DOCKER_REPOSITORY/" diff --git a/auth/docker/dclean.sh b/auth/docker/dclean.sh index 4fb4e07a..0e974aa6 100644 --- a/auth/docker/dclean.sh +++ b/auth/docker/dclean.sh @@ -23,7 +23,7 @@ DOCKER=${DOCKER:=docker} if [ "$1" == "" ]; then - AAF_COMPONENTS="$(cat components) config core agent " + AAF_COMPONENTS="$(cat components) config core agent base " else AAF_COMPONENTS="$@" fi diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index b4d3545c..9bfb80c8 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.1.16 + 2.1.17-SNAPSHOT ../pom.xml diff --git a/auth/helm/.gitignore b/auth/helm/.gitignore index 44cae669..e106bce2 100644 --- a/auth/helm/.gitignore +++ b/auth/helm/.gitignore @@ -2,3 +2,6 @@ aaf.orig/ pause/ aaf.new/ aaf.props +.DS_Store +current +*.tgz diff --git a/auth/helm/aaf-hello/values.yaml b/auth/helm/aaf-hello/values.yaml index 5a3931c2..130fa74e 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.16-SNAPSHOT - image: onap/aaf/aaf_hello:2.1.16-SNAPSHOT + agentImage: onap/aaf/aaf_agent:2.1.17-SNAPSHOT + image: onap/aaf/aaf_hello:2.1.17-SNAPSHOT app_ns: "org.osaaf.aaf" fqi: "aaf@aaf.osaaf.org" fqdn: "aaf-hello" diff --git a/auth/helm/aaf/Chart.yaml b/auth/helm/aaf/Chart.yaml index f83041e9..976e2efe 100644 --- a/auth/helm/aaf/Chart.yaml +++ b/auth/helm/aaf/Chart.yaml @@ -22,4 +22,4 @@ apiVersion: v1 appVersion: "1.0" description: AAF Helm Chart name: aaf -version: 2.1.16-SNAPSHOT +version: 2.1.17-SNAPSHOT diff --git a/auth/helm/aaf/values.yaml b/auth/helm/aaf/values.yaml index b320d9c8..9cfee331 100644 --- a/auth/helm/aaf/values.yaml +++ b/auth/helm/aaf/values.yaml @@ -104,7 +104,7 @@ image: # When using Docker Repo, add, and include trailing "/" # repository: nexus3.onap.org:10003/ # repository: localhost:5000/ - version: 2.1.16-SNAPSHOT + version: 2.1.17-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 27abccdb..f65e5564 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT authparent AAF Auth Parent diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh index 4768d81c..4132e6ca 100755 --- a/auth/sample/bin/client.sh +++ b/auth/sample/bin/client.sh @@ -21,7 +21,7 @@ # This script is run when starting client Container. # It needs to cover the cases where the initial data doesn't exist, and when it has already been configured (don't overwrite) # -JAVA=/usr/bin/java +JAVA=${JAVA_HOME}/bin/java AAF_INTERFACE_VERSION=2.1 # Extract Name, Domain and NS from FQI diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh index bddd42c9..10a3e15e 100644 --- a/auth/sample/bin/service.sh +++ b/auth/sample/bin/service.sh @@ -39,7 +39,7 @@ cadi_longitude=${cadi_longitude:-"${LONGITUDE}"} cadi_x509_issuers=${cadi_x509_issuers:-"${CADI_X509_ISSUERS}"} aaf_locate_url=${aaf_locate_url:-"https://${HOSTNAME}:8095"} -JAVA=/usr/bin/java +JAVA=${JAVA_HOME}/bin/java OSAAF=/opt/app/osaaf LOCAL=$OSAAF/local diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 1fa4ab59..079642a7 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 38d50820..8f3c6a1d 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index aa50090b..bbf0d501 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index efc32dd4..405649ca 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index 9075385a..8a4fc44c 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 7ca8aa4b..2b41d92f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 360b920c..5bc0e0ec 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 7bfc1bce..8d88852b 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 68e3c4b1..173fa6c0 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 9c6d003a..bf11b795 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. @@ -93,8 +93,23 @@ org.onap.aaf.authz aaf-misc-env - ${project.version} + + javax.xml.bind + jaxb-api + + + org.glassfish.jaxb + jaxb-runtime + runtime + + + com.sun.istack + istack-commons-runtime + 2.2 + runtime + + diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 83153890..8d7e86ef 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 55c36e02..a7530708 100644 --- a/pom.xml +++ b/pom.xml @@ -22,14 +22,19 @@ 4.0.0 org.onap.aaf.authz parent - 2.1.16-SNAPSHOT + 2.1.17-SNAPSHOT aaf-authz pom org.onap.oparent oparent + + 3.0.0-SNAPSHOT @@ -51,7 +56,8 @@ ${project.version} 9.4.12.v20180830 3.6.0 - + 2.3.1 + 3.0-b71 @@ -342,6 +348,23 @@ test + + + javax.xml.bind + jaxb-api + ${project.jaxbVersion} + + + org.glassfish.jaxb + jaxb-xjc + ${project.jaxbVersion} + + + org.glassfish.jaxb + jaxb-runtime + ${project.jaxbVersion} + + diff --git a/version.properties b/version.properties index 564f55f4..de52dc04 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.16-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: +# This TAG 2.1.17-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=16 +patch=17 base_version=${major}.${minor}.${patch} -- 2.16.6