diff options
| author |   Jonathan Gathman <jonathan.gathman@att.com> | 2018-04-05 22:56:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-05 22:56:09 +0000 |
| commit | d9b65e866ed666c3b538203da5bb3d05ba758417 (patch) | |
| tree | 7dec9890594bbfc8018ec0ee654194b0fb1d4863 /auth | |
| parent | b9b52eb4cc3527c5a02a8f4e587469c046754c1b (diff) | |
| parent | c83c633d7a5f8ae8a7f84a15e3824c46ced305fe (diff) | |
Merge "Modify cadi & misc versions in authz"
Diffstat (limited to 'auth')
| -rw-r--r-- | auth/auth-service/src/main/resources/docker-compose/docker-compose.yml | 6 | ||||
| -rw-r--r-- | auth/pom.xml | 4 |
2 files changed, 5 insertions, 5 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 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion> - <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion> - <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion> + <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion> + <project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion> <!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion --> <project.jettyVersion>9.4.8.v20171121</project.jettyVersion> <powermock.version>1.5.1</powermock.version> |