From c83c633d7a5f8ae8a7f84a15e3824c46ced305fe Mon Sep 17 00:00:00 2001 From: Sai Gandham Date: Thu, 5 Apr 2018 16:08:24 -0500 Subject: Modify cadi & misc versions in authz Changed cadi version from 1.5.0-SNAPSHOT to 2.1.0-SNAPSHOT Changed misc version from 1.3.0-SNAPSHOT to 2.1.0-SNAPSHOT Issue-ID: AAF-215 Change-Id: I161311c479504547251334d1681d1aec848fe49d Signed-off-by: Sai Gandham --- .../src/main/resources/docker-compose/docker-compose.yml | 6 +++--- auth/pom.xml | 4 ++-- cadi/aaf/pom.xml | 2 +- cadi/cass/pom.xml | 2 +- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 6 +++--- cadi/pom.xml | 4 ++-- cadi/shiro/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 +- version.properties | 6 +++--- 15 files changed, 23 insertions(+), 23 deletions(-) diff --git a/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml b/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml index 8272afbb..eedfe266 100644 --- a/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml +++ b/auth/auth-service/src/main/resources/docker-compose/docker-compose.yml @@ -33,9 +33,9 @@ services: - ./data2:/data # - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh # - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props - # - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar - # - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar - # - ./cadi-client-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-1.3.0.jar + # - ./cadi-core-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-2.1.0.jar + # - ./cadi-aaf-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-2.1.0.jar + # - ./cadi-client-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-2.1.0.jar # - ./authz-service-2.0.15.jar:/opt/app/aaf/authz-service/2.0.15/lib/authz-service-2.0.15.jar # - ./dme2-3.1.200.jar:/opt/app/aaf/authz-service/2.0.15/lib/dme2-3.1.200.jar entrypoint: ["bash", "-c", "/tmp/wait_for_host_port.sh cassandra_container 9042; sleep 20; /bin/sh -c ./startup.sh"] diff --git a/auth/pom.xml b/auth/pom.xml index d6d3d94b..f9a6c7c1 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -37,8 +37,8 @@ UTF-8 2.10-SNAPSHOT - 1.3.0-SNAPSHOT - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT + 2.1.0-SNAPSHOT 9.4.8.v20171121 1.5.1 diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index a25d6e36..c2fd0b2d 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.cadi parent - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/cadi/cass/pom.xml b/cadi/cass/pom.xml index a17a4bf7..bbe9b19b 100644 --- a/cadi/cass/pom.xml +++ b/cadi/cass/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.cadi parent - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index 84247026..46a83677 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz.cadi parent - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index 2412651e..c458fc98 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz.cadi parent .. - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 608d37ab..aba60a9d 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -24,7 +24,7 @@ 4.0.0 AAF CADI Sample OAuth EndUser org.onap.aaf.authz.cadi - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT aaf-cadi-oauth-enduser jar @@ -79,12 +79,12 @@ org.onap.aaf.authz.cadi aaf-cadi-core - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT org.onap.aaf.authz.cadi aaf-cadi-aaf - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/cadi/pom.xml b/cadi/pom.xml index 860f77a1..b6f12625 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.cadi parent AAF CADI Parent (Code, Access, Data, Identity) - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT 2015-07-20 ONAP @@ -40,7 +40,7 @@ true UTF-8 - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT 2.10-SNAPSHOT 9.3.9.v20160517 1.5.1 diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml index 91503e23..4813c383 100644 --- a/cadi/shiro/pom.xml +++ b/cadi/shiro/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.cadi parent - 1.5.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 1c82d8c6..13114327 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.misc parent - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 96b62137..e2519414 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.misc parent - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 26a95457..f90e06e3 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz.misc parent AAF Misc Parent - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT pom diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index 84acecad..dcf268a3 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.misc parent - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index c808dc7a..2455f42f 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz.misc parent - 1.3.0-SNAPSHOT + 2.1.0-SNAPSHOT .. diff --git a/version.properties b/version.properties index 921ea4fc..c5683938 100644 --- a/version.properties +++ b/version.properties @@ -25,9 +25,9 @@ # 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 -major=1 -minor=0 -patch=1 +major=2 +minor=1 +patch=0 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg