Change groupID to match Garrit Project

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

15 files changed, 84 insertions, 78 deletions

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index cd553506..2813a559 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -72,6 +72,8 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -92,27 +94,27 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 1835812c..429a1220 100644
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -72,8 +72,10 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<!--  SONAR  -->
-		 <jacoco.version>0.7.7.201606060606</jacoco.version>
+		<jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
 	    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
 	    <!-- Default Sonar configuration -->
@@ -90,12 +92,12 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
diff --git a/auth/auth-cass/target/test-classes/com/att/dao/aaf/test/.gitignore b/auth/auth-cass/target/test-classes/com/att/dao/aaf/test/.gitignore
deleted file mode 100644
index 1871693c..00000000
--- a/auth/auth-cass/target/test-classes/com/att/dao/aaf/test/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-/JU_OAuthAppDAO.java
-/.settings/
-/.project
-/target/
-/.classpath
diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 5363a824..f4860727 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -34,8 +34,6 @@
 	<description>Certificate Manager API</description>
 
 	<properties>
-	<skipTests>true</skipTests>
-		<project.swmVersion>21</project.swmVersion>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -54,17 +52,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml
index 25a406e4..c53b9597 100644
--- a/auth/auth-client/pom.xml
+++ b/auth/auth-client/pom.xml
@@ -27,7 +27,7 @@
 	<artifactId>aaf-auth-client</artifactId>
 	<name>AAF Auth Client</name>
 	<description>XSD Generated classes for AAF Auth</description>
-	<groupId>org.onap.aaf.auth</groupId>
+	<groupId>org.onap.aaf.authz.auth</groupId>
 	<version>2.10-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 261e425d..c67e8490 100644
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -24,7 +24,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -37,6 +37,8 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -166,12 +168,12 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 327a3d51..f1948747 100644
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -73,6 +73,8 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
 	    <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
@@ -91,11 +93,11 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-env</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
@@ -105,12 +107,12 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-log4j</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 
diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 1fa3f495..2e02120d 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<artifactId>parent</artifactId>
 		<relativePath>../pom.xml</relativePath>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<version>2.1.0-SNAPSHOT</version>
 	</parent>
 
@@ -73,6 +73,8 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<maven.test.failure.ignore>false</maven.test.failure.ignore>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -93,12 +95,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index f3bbdd3a..31f2c33f 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -35,6 +35,8 @@
 
 	<properties>
 	<skipTests>true</skipTests>
+
+
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<!--  SONAR  -->
 		 <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -91,12 +93,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-core</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 0efa1d8e..946f2a3e 100644
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -54,17 +54,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-client</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cmd</artifactId>
 		</dependency>
 
@@ -72,22 +72,22 @@
 			you have something else Match with Property Entry: Organization.<root ns>, 
 			i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-deforg</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-client</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-xgen</artifactId>
 		</dependency>
 
diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 97226500..0b64aa90 100644
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -15,7 +15,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -45,12 +45,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index cedf3472..dc69368b 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -53,17 +53,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index 85c69433..3941702c 100644
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -53,17 +53,17 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index d8714cfa..8c71d58f 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.onap.aaf.auth</groupId>
+		<groupId>org.onap.aaf.authz.auth</groupId>
 		<artifactId>parent</artifactId>
 		<version>2.1.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
@@ -54,12 +54,12 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-client</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-core</artifactId>
 		</dependency>
 
@@ -67,27 +67,27 @@
 			you have something else Match with Property Entry: Organization.<root ns>, 
 			i.e. Organization.onap.org=org.onap.org.DefaultOrg -->
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-deforg</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-cass</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.auth</groupId>
+			<groupId>org.onap.aaf.authz.auth</groupId>
 			<artifactId>aaf-auth-oauth</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.misc</groupId>
+			<groupId>org.onap.aaf.authz.misc</groupId>
 			<artifactId>aaf-misc-rosetta</artifactId>
 		</dependency>
 
 		<dependency>
-			<groupId>org.onap.aaf.cadi</groupId>
+			<groupId>org.onap.aaf.authz.cadi</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
 		</dependency>
 
diff --git a/auth/pom.xml b/auth/pom.xml
index 4372d6e7..90892914 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,7 +23,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.onap.aaf.auth</groupId>
+	<groupId>org.onap.aaf.authz.auth</groupId>
 	<artifactId>parent</artifactId>
 	<version>2.1.0-SNAPSHOT</version>
 	<name>AAF Auth Parent</name>
@@ -116,7 +116,8 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<version>2.17</version>
 					<configuration>
-						<skipTests>${skipTests}</skipTests>
+						<skipTests>true</skipTests>
+
 						<includes>
 							<include>**/JU*.java</include>
 						</includes>
@@ -376,43 +377,43 @@
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>org.onap.aaf.misc</groupId>
+				<groupId>org.onap.aaf.authz.misc</groupId>
 				<artifactId>aaf-misc-env</artifactId>
 				<version>${project.miscVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.misc</groupId>
+				<groupId>org.onap.aaf.authz.misc</groupId>
 				<artifactId>aaf-misc-log4j</artifactId>
 				<version>${project.miscVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.misc</groupId>
+				<groupId>org.onap.aaf.authz.misc</groupId>
 				<artifactId>aaf-misc-rosetta</artifactId>
 				<version>${project.miscVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.misc</groupId>
+				<groupId>org.onap.aaf.authz.misc</groupId>
 				<artifactId>aaf-misc-xgen</artifactId>
 				<version>${project.miscVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
+				<groupId>org.onap.aaf.authz.cadi</groupId>
 				<artifactId>aaf-cadi-core</artifactId>
 				<version>${project.cadiVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
+				<groupId>org.onap.aaf.authz.cadi</groupId>
 				<artifactId>aaf-cadi-client</artifactId>
 				<version>${project.cadiVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.cadi</groupId>
+				<groupId>org.onap.aaf.authz.cadi</groupId>
 				<artifactId>aaf-cadi-aaf</artifactId>
 				<version>${project.cadiVersion}</version>
 				<exclusions>
@@ -424,37 +425,37 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-client</artifactId>
 				<version>${project.interfaceVersion}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-cass</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-cmd</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-oauth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.auth</groupId>
+				<groupId>org.onap.aaf.authz.auth</groupId>
 				<artifactId>aaf-auth-deforg</artifactId>
 				<version>${project.version}</version>
 			</dependency>