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: [PATCH] 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 ++--
 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 @@
 	<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>
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.cadi</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.cadi</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.cadi</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 		<groupId>org.onap.aaf.authz.cadi</groupId>
 		<artifactId>parent</artifactId>
 		<relativePath>..</relativePath>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
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 @@
 	<modelVersion>4.0.0</modelVersion>
 	<name>AAF CADI Sample OAuth EndUser</name>
 	<groupId>org.onap.aaf.authz.cadi</groupId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<artifactId>aaf-cadi-oauth-enduser</artifactId>
 
 	<packaging>jar</packaging>
@@ -79,12 +79,12 @@
 		<dependency>
 			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
-			<version>1.5.0-SNAPSHOT</version>
+			<version>2.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
-			<version>1.5.0-SNAPSHOT</version>
+			<version>2.1.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
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 @@
 	<groupId>org.onap.aaf.authz.cadi</groupId>
 	<artifactId>parent</artifactId>
 	<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<inceptionYear>2015-07-20</inceptionYear>
 	<organization>
 		<name>ONAP</name>
@@ -40,7 +40,7 @@
 	<properties>
 		<skipSigning>true</skipSigning>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
+		<project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
 		<project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
 		<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
 		<powermock.version>1.5.1</powermock.version>
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.cadi</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.misc</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.misc</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<groupId>org.onap.aaf.authz.misc</groupId>
 	<artifactId>parent</artifactId>
 	<name>AAF Misc Parent</name>
-	<version>1.3.0-SNAPSHOT</version>
+	<version>2.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.misc</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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 @@
 	<parent>
 		<groupId>org.onap.aaf.authz.misc</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
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}
 
-- 
2.16.6