Pull in all pom changes, merge, and review

Issue-ID: AAF-211
Change-Id: Ibc8550fac594af6d292690215e72664c20b3f837
Signed-off-by: Instrumental <jcgmisc@stl.gathman.org>

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 8272afb..eedfe26 100644 (file)
--- 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\r
     # - ./runaafcli.sh:/opt/app/aaf/authz-service/2.0.15/runaafcli.sh\r
     #  - ./com.osaaf.common.props:/opt/app/aaf/authz-service/2.0.15/etc/com.osaaf.common.props\r
-    # - ./cadi-core-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-1.3.0.jar\r
-    #  - ./cadi-aaf-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-1.3.0.jar\r
-    # - ./cadi-client-1.3.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-1.3.0.jar\r
+    # - ./cadi-core-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-core-2.1.0.jar\r
+    #  - ./cadi-aaf-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-aaf-2.1.0.jar\r
+    # - ./cadi-client-2.1.0.jar:/opt/app/aaf/authz-service/2.0.15/lib/cadi-client-2.1.0.jar\r
     # - ./authz-service-2.0.15.jar:/opt/app/aaf/authz-service/2.0.15/lib/authz-service-2.0.15.jar\r
     #  - ./dme2-3.1.200.jar:/opt/app/aaf/authz-service/2.0.15/lib/dme2-3.1.200.jar\r
     entrypoint: ["bash", "-c", "/tmp/wait_for_host_port.sh cassandra_container 9042; sleep 20; /bin/sh -c ./startup.sh"]\r

diff --git a/auth/pom.xml b/auth/pom.xml
index d6d3d94..f9a6c7c 100644 (file)
--- 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 a25d6e3..c2fd0b2 100644 (file)
--- 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 a17a4bf..bbe9b19 100644 (file)
--- 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 8424702..46a8367 100644 (file)
--- 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 2412651..c458fc9 100644 (file)
--- 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 608d37a..aba60a9 100644 (file)
--- 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 860f77a..b6f1262 100644 (file)
--- 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 91503e2..4813c38 100644 (file)
--- 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 1c82d8c..1311432 100644 (file)
--- 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 96b6213..e251941 100644 (file)
--- 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 26a9545..f90e06e 100644 (file)
--- 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 84aceca..dcf268a 100644 (file)
--- 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 c808dc7..2455f42 100644 (file)
--- 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 921ea4f..c568393 100644 (file)
--- 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... )\r
 # because they are used in Jenkins, whose plug-in doesn't support\r
 \r
-major=1\r
-minor=0\r
-patch=1\r
+major=2\r
+minor=1\r
+patch=0\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r