Keep same groupID across AAF repo
Issue-ID: AAF-215
Change-Id: I1f4b9627702aa8438f8745a2ba6a8ec8efe407a8
Signed-off-by: Sai Gandham <sg481n@att.com>
diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 25ae5ee..d02cb5a 100644
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -22,8 +22,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -48,7 +48,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
<developer>
@@ -89,25 +89,25 @@
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index 9d59685..20fd84c 100644
--- a/cadi/client/pom.xml
+++ b/cadi/client/pom.xml
@@ -20,8 +20,8 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -47,7 +47,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
@@ -88,13 +88,13 @@
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index b2f03be..b810e12 100644
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -13,8 +13,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<relativePath>..</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
@@ -38,7 +38,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 976c7e0..81a3fe6 100644
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -23,14 +23,14 @@
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.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<name>AAF CADI Sample OAuth EndUser</name>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<version>2.1.0-SNAPSHOT</version>
<artifactId>aaf-cadi-oauth-enduser</artifactId>
<packaging>jar</packaging>
@@ -50,7 +50,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
@@ -83,12 +83,12 @@
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/cadi/pom.xml b/cadi/pom.xml
index 7477367..25ed1d0 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -23,11 +23,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.onap.aaf.authz</groupId>
- <artifactId>super-pom</artifactId>
+ <artifactId>parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
<version>2.1.0-SNAPSHOT</version>
<inceptionYear>2015-07-20</inceptionYear>
@@ -55,7 +55,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<!-- ============================================================== -->
@@ -144,19 +144,19 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-oauth</artifactId>
<version>${project.version}</version>
</dependency>
@@ -164,57 +164,57 @@
<!-- Prevent Cycles in Testing -->
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
<classifier>full</classifier>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-log4j</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 9fc3c14..76ec2e6 100644
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -22,8 +22,8 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -48,7 +48,7 @@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/cadi/${project.artifactId}/${project.version}</sitePath>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
@@ -89,7 +89,7 @@
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
</dependency>