From db2888d4ff0dff6fd1625d9b31e7a22c3a06bc49 Mon Sep 17 00:00:00 2001
From: Instrumental <jcgmisc@stl.gathman.org>
Date: Thu, 5 Apr 2018 18:10:49 -0500
Subject: Pull in all pom changes, merge, and review

Issue-ID: AAF-211
Change-Id: Ibc8550fac594af6d292690215e72664c20b3f837
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>
---
 .../src/main/resources/docker-compose/docker-compose.yml            | 6 +++---
 auth/pom.xml                                                        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'auth')

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>
-- 
cgit 1.2.3-korg