diff options
Diffstat (limited to 'version-manifest/src')
4 files changed, 111 insertions, 48 deletions
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv index 1a1fbf793..0b338ab3f 100644 --- a/version-manifest/src/main/resources/docker-manifest-staging.csv +++ b/version-manifest/src/main/resources/docker-manifest-staging.csv @@ -1,11 +1,11 @@ image,tag -onap/aaf/aaf_cm,2.1.1 -onap/aaf/aaf_fs,2.1.1 -onap/aaf/aaf_gui,2.1.1 -onap/aaf/aaf_hello,2.1.1 -onap/aaf/aaf_locate,2.1.1 -onap/aaf/aaf_oauth,2.1.1 -onap/aaf/aaf_service,2.1.1 +onap/aaf/aaf_cm,2.1.2-SNAPSHOT +onap/aaf/aaf_fs,2.1.2-SNAPSHOT +onap/aaf/aaf_gui,2.1.2-SNAPSHOT +onap/aaf/aaf_hello,2.1.2-SNAPSHOT +onap/aaf/aaf_locate,2.1.2-SNAPSHOT +onap/aaf/aaf_oauth,2.1.2-SNAPSHOT +onap/aaf/aaf_service,2.1.2-SNAPSHOT onap/aaf/sms,2.0.0 onap/aaf/smsquorumclient,2.0.0 onap/aai-resources,1.2.2 @@ -13,26 +13,27 @@ onap/aai-traversal,1.2.2 onap/aai/esr-gui,1.1.0 onap/aai/esr-server,1.1.0 onap/admportal-sdnc-image,1.4-STAGING-latest -onap/appc-cdt-image,1.3.0 +onap/appc-cdt-image,1.4.0-SNAPSHOT-latest onap/appc-image,1.4.0-SNAPSHOT-latest onap/babel,1.2.0 onap/ccsdk-dgbuilder-image,0.3-STAGING-latest onap/ccsdk-odl-image,0.3-STAGING-latest onap/ccsdk-odlsli-image,0.3-STAGING-latest onap/champ,1.2.3 -onap/clamp,2.0.2 +onap/clamp,3.0-STAGING-latest onap/cli,2.0.2 onap/data-router,1.2.2 onap/dmaap/buscontroller,1.0.12 -onap/dmaap/dmaap-mr,1.1.4 -onap/externalapi/nbi,2.0.0 +onap/dmaap/dmaap-mr,1.1.6 +onap/dmaap/kafka01101,0.0.1 +onap/externalapi/nbi,3.0.0-latest onap/gizmo,1.2.1 -onap/holmes/engine-management,1.1.0 -onap/holmes/rule-management,1.1.0 +onap/holmes/engine-management,1.2.0-STAGING-latest +onap/holmes/rule-management,1.2.0-STAGING-latest onap/model-loader,1.2.1 onap/msb/msb_apigateway,1.2.0-STAGING-latest onap/msb/msb_discovery,1.2.0-STAGING-latest -onap/multicloud/framework,1.1.2 +onap/multicloud/framework,1.2.0-STAGING onap/multicloud/openstack-newton,1.2.0-STAGING onap/multicloud/openstack-ocata,1.2.0-STAGING onap/multicloud/openstack-windriver,1.2.0-STAGING @@ -40,6 +41,7 @@ onap/multicloud/vio,1.1.2 onap/multicloud/vio-vesagent,1.0.0 onap/music/cassandra_music,3.0.0 onap/music/music,2.5.3 +onap/music/prom,1.0.5-latest onap/oom/kube2msb,1.1.0 onap/optf-has,1.2.1-STAGING-latest onap/optf-osdf,1.2.1-STAGING-latest @@ -57,6 +59,7 @@ onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5 onap/org.onap.dcaegen2.platform.inventory-api,3.0.1 onap/org.onap.dcaegen2.platform.policy-handler,2.4.5 onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4 +onap/policy-apex-pdp,2.0-SNAPSHOT-latest onap/policy-drools,1.3-SNAPSHOT-latest onap/policy-pe,1.3-SNAPSHOT-latest onap/portal-app,2.2.0 @@ -81,13 +84,22 @@ onap/sdnc-ansible-server-image,1.4-STAGING-latest onap/sdnc-dmaap-listener-image,1.4-STAGING-latest onap/sdnc-image,1.4-STAGING-latest onap/sdnc-ueb-listener-image,1.4-STAGING-latest -onap/search-data-service,1.2.1 +onap/search-data-service,1.2.2 onap/sniroemulator,1.0.0 +onap/so/api-handler-infra,1.3.0-STAGING-latest +onap/so/bpmn-infra,1.3.0-STAGING-latest +onap/so/catalog-db-adapter,1.3.0-STAGING-latest +onap/so/openstack-adapter,1.3.0-STAGING-latest +onap/so/request-db-adapter,1.3.0-STAGING-latest +onap/so/sdc-controller,1.3.0-STAGING-latest +onap/so/sdnc-adapter,1.3.0-STAGING-latest +onap/so/vfc-adapter,1.3.0-STAGING-latest onap/sparky-be,1.2.1 -onap/testsuite,1.3.0-STAGING-latest +onap/testsuite,1.3.1-STAGING-latest onap/usecase-ui,1.1.1 onap/usecase-ui/usecase-ui-server,1.1.1 onap/vfc/catalog,1.1.0 +onap/vfc/db,1.1.0-STAGING-latest onap/vfc/emsdriver,1.1.0 onap/vfc/gvnfmdriver,1.1.0 onap/vfc/jujudriver,1.1.0 @@ -104,9 +116,8 @@ onap/vfc/wfengine-activiti,1.1.0 onap/vfc/wfengine-mgrservice,1.1.0 onap/vfc/ztesdncdriver,1.1.0 onap/vfc/ztevnfmdriver,1.1.0 -onap/vid,2.0.0 +onap/vid,3.0-STAGING-latest onap/vnfsdk/ice,1.1.0 onap/vnfsdk/refrepo,1.1.1 onap/vnfsdk/refrepo/postgres,1.1.1 onap/vnfsdk/vnftest,1.1.0 -openecomp/mso,1.2.2 diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv index da87af4c3..9e1123344 100644 --- a/version-manifest/src/main/resources/docker-manifest.csv +++ b/version-manifest/src/main/resources/docker-manifest.csv @@ -25,7 +25,7 @@ onap/cli,2.0.2 onap/data-router,1.2.2 onap/dmaap/buscontroller,1.0.12 onap/dmaap/dmaap-mr,1.1.4 -onap/externalapi/nbi,2.0.0 +onap/externalapi/nbi,2.1.1 onap/gizmo,1.2.1 onap/holmes/engine-management,1.1.0 onap/holmes/rule-management,1.1.0 @@ -84,7 +84,7 @@ onap/sdnc-ueb-listener-image,1.3.4 onap/search-data-service,1.2.1 onap/sniroemulator,1.0.0 onap/sparky-be,1.2.1 -onap/testsuite,1.2.1 +onap/testsuite,1.3.0 onap/usecase-ui,1.1.1 onap/usecase-ui/usecase-ui-server,1.1.1 onap/vfc/catalog,1.1.0 diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv index 5393b80bb..64d78a667 100644 --- a/version-manifest/src/main/resources/java-manifest.csv +++ b/version-manifest/src/main/resources/java-manifest.csv @@ -1,28 +1,28 @@ groupId,artifactId,version -org.onap.aaf.authz,aaf-auth-batch,2.1.1 -org.onap.aaf.authz,aaf-auth-cass,2.1.1 -org.onap.aaf.authz,aaf-auth-certman,2.1.1 -org.onap.aaf.authz,aaf-auth-client,2.1.1 -org.onap.aaf.authz,aaf-auth-cmd,2.1.1 -org.onap.aaf.authz,aaf-auth-core,2.1.1 -org.onap.aaf.authz,aaf-auth-deforg,2.1.1 -org.onap.aaf.authz,aaf-auth-fs,2.1.1 -org.onap.aaf.authz,aaf-auth-gui,2.1.1 -org.onap.aaf.authz,aaf-auth-hello,2.1.1 -org.onap.aaf.authz,aaf-auth-locate,2.1.1 -org.onap.aaf.authz,aaf-auth-oauth,2.1.1 -org.onap.aaf.authz,aaf-auth-service,2.1.1 -org.onap.aaf.authz,aaf-cadi-aaf,2.1.1 -org.onap.aaf.authz,aaf-cadi-cass,2.1.1 -org.onap.aaf.authz,aaf-cadi-client,2.1.1 -org.onap.aaf.authz,aaf-cadi-core,2.1.1 -org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.1 -org.onap.aaf.authz,aaf-cadi-shiro,2.1.1 -org.onap.aaf.authz,aaf-misc-env,2.1.1 -org.onap.aaf.authz,aaf-misc-log4j,2.1.1 -org.onap.aaf.authz,aaf-misc-rosetta,2.1.1 -org.onap.aaf.authz,aaf-misc-xgen,2.1.1 -org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.1 +org.onap.aaf.authz,aaf-auth-batch,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-cass,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-certman,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-client,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-cmd,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-core,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-deforg,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-fs,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-gui,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-hello,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-locate,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-oauth,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-auth-service,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-aaf,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-cass,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-client,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-core,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-oauth-enduser,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-cadi-shiro,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-misc-env,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-misc-log4j,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-misc-rosetta,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-misc-xgen,2.1.2-SNAPSHOT +org.onap.aaf.authz,aaf-shiro-aafrealm-osgi-bundle,2.1.2-SNAPSHOT org.onap.aai,rest-client,1.2.1 org.onap.aai,search-data-service,1.2.0 org.onap.aai.aai-common,aai-annotations,1.2.4 @@ -185,10 +185,10 @@ org.onap.dmaap.messagerouter.dmaapclient,dmaapClient,1.0.0 org.onap.dmaap.messagerouter.messageservice,dmaapMR1,1.0.1 org.onap.dmaap.messagerouter.mirroragent,dmaapMMAgent,1.0.0 org.onap.dmaap.messagerouter.msgrtr,msgrtr,1.0.0 -org.onap.holmes.common,holmes-actions,1.0.0 -org.onap.holmes.dsa,dmaap-dsa,1.0.0 -org.onap.holmes.engine-management,holmes-engine-d,1.1.0 -org.onap.holmes.rule-management,holmes-rulemgt,1.1.0 +org.onap.holmes.common,holmes-actions,1.2.0-SNAPSHOT +org.onap.holmes.dsa,dmaap-dsa,1.2.0-SNAPSHOT +org.onap.holmes.engine-management,holmes-engine-d,1.2.0-SNAPSHOT +org.onap.holmes.rule-management,holmes-rulemgt,1.2.0-SNAPSHOT org.onap.modeling.toscaparsers,Checker,1.0.0 org.onap.modeling.toscaparsers,Service,1.0.0 org.onap.modeling.toscaparsers,kwalify,1.0.0 diff --git a/version-manifest/src/main/scripts/upgrade-oparent.sh b/version-manifest/src/main/scripts/upgrade-oparent.sh new file mode 100755 index 000000000..aec665ee9 --- /dev/null +++ b/version-manifest/src/main/scripts/upgrade-oparent.sh @@ -0,0 +1,52 @@ +#!/bin/bash +# +# Copyright 2017 Huawei Technologies Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +cat projects.txt | grep -v oparent | grep -v doc | grep -v ci-management | while read p; do + pushd $p + + #git fetch origin + #git reset --hard origin + for pom in $(find -name pom.xml); do + git checkout origin/master -- $pom + dos2unix < $pom | cmp -s - $pom + IS_DOS=$? + if grep -q "oparent" $pom; then + xmlstarlet ed -L -P -N ns="http://maven.apache.org/POM/4.0.0" -u '/_:project/_:parent[_:groupId="org.onap.oparent" and _:artifactId="oparent"]/_:version' -v '1.2.0' $pom + sed -i 's/^[ \t]*$//' $pom + fi + if grep -q "guava" $pom; then + xmlstarlet ed -L -P -N ns="http://maven.apache.org/POM/4.0.0" -d '//_:dependency[_:groupId="com.google.guava" and _:artifactId="guava"]/_:version' $pom + sed -i 's/^[ \t]*$//' $pom + fi + if [ $IS_DOS -ne 0 ]; then + unix2dos $pom + fi + done + git --no-pager diff + + + if [ $(git rev-parse HEAD) == $(git rev-parse @{u}) ]; then + + git commit -a -s -m 'Use managed guava version + +Use centrally managed guava version specified in +oparent. Includes upgrade to oparent 1.2.0. + +This change was submitted by script and may include +additional whitespace or formatting changes. + +Issue-ID: INT-619 +' + else + git commit -a -s --amend --no-edit + fi + git review -r origin -D + popd +done |