Change Beijing Release to 2.1.1

[aaf/authz.git] / cadi / pom.xml

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 1a931c5..4393f08 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -22,26 +22,22 @@
 <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">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-    <groupId>org.onap.aaf.authz</groupId>
-    <artifactId>super-pom</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+           <groupId>org.onap.aaf.authz</groupId>
+           <artifactId>parent</artifactId>
+           <version>2.1.1-SNAPSHOT</version>
     </parent>
-       <groupId>org.onap.aaf.authz.cadi</groupId>
-       <artifactId>parent</artifactId>
+       <artifactId>cadiparent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-       <version>2.1.0-SNAPSHOT</version>
        <inceptionYear>2015-07-20</inceptionYear>
        <organization>
                <name>ONAP</name>
        </organization>
        <packaging>pom</packaging>
 
-
+       
        <properties>
-               <skipSigning>true</skipSigning>
+               <!-- <sonar.skip>true</sonar.skip> -->
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <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>
                <!--  SONAR  -->
@@ -57,7 +53,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>
 
        <!-- ============================================================== -->
@@ -138,6 +134,7 @@
                <module>aaf</module>
                <module>oauth-enduser</module>
                <module>shiro</module>
+               <module>shiro-osgi-bundle</module>
        </modules>
 
        <!-- ============================================================== -->
@@ -146,19 +143,19 @@
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.onap.aaf.authz.auth</groupId>
+                               <groupId>org.onap.aaf.authz</groupId>
                                <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.authClientVersion}</version>
+                               <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>
@@ -166,59 +163,59 @@
 
                        <!-- 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.miscVersion}</version>
+                               <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.miscVersion}</version>
+                               <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.miscVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>