CLM versions

Issue-ID: AAF-419
Change-Id: Id863c1b4a0370eabd1849c38e84f512d20504848
Signed-off-by: Instrumental <jonathan.gathman@att.com>

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index b6f30d2..867313e 100644 (file)
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -63,9 +63,6 @@
        </developers>
 
        <properties>
-
-
-
                <!-- SONAR -->
                <!-- <sonar.skip>true</sonar.skip> -->
                <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -100,6 +97,11 @@
                        <artifactId>cassandra-driver-core</artifactId>
                </dependency>
 
+               <dependency>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+               </dependency>
+
                <!-- Cassandra prefers Snappy and LZ4 libs for performance -->
                <dependency>
                        <groupId>org.xerial.snappy</groupId>

diff --git a/auth/pom.xml b/auth/pom.xml
index e3ec9c0..a6af750 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -35,11 +35,6 @@
        
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.interfaceVersion>2.1.1-SNAPSHOT</project.interfaceVersion>
-               <!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
-               <!-- project.jettyVersion>9.4.11.v20180605</project.jettyVersion -->
-               <project.jettyVersion>9.4.12.RC2</project.jettyVersion>
-               <powermock.version>1.5.1</powermock.version>
                <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
                <!--  SONAR  -->
                 <jacoco.version>0.7.7.201606060606</jacoco.version>
@@ -340,25 +335,21 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
                        <scope>test</scope>
                </dependency>
 
@@ -382,166 +373,5 @@
                <module>auth-hello</module>
        </modules>
 
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-env</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-log4j</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-rosetta</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-xgen</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-core</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-client</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-aaf</artifactId>
-                               <version>${project.version}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.apache.cassandra</groupId>
-                                               <artifactId>cassandra-all</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-core</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-cass</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-cmd</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-oauth</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-deforg</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>javax.servlet</groupId>
-                               <artifactId>javax.servlet-api</artifactId>
-                               <version>3.0.1</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-servlet</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-server</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>com.datastax.cassandra</groupId>
-                               <artifactId>cassandra-all</artifactId>
-                               <version>${project.cassVersion}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.slf4j</groupId>
-                                               <artifactId>slf4j-log4j12</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>log4j</groupId>
-                                               <artifactId>log4j</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>com.datastax.cassandra</groupId>
-                               <artifactId>cassandra-driver-core</artifactId>
-                               <version>${project.cassVersion}</version>
-                               <exclusions>
-                                       <exclusion>
-                                               <groupId>org.slf4j</groupId>
-                                               <artifactId>slf4j-log4j12</artifactId>
-                                       </exclusion>
-                                       <exclusion>
-                                               <groupId>log4j</groupId>
-                                               <artifactId>log4j</artifactId>
-                                       </exclusion>
-                               </exclusions>
-                       </dependency>
-                       
-                       <!-- Note: Ensure DataStax uses more up-to-date netty handler -->               
-                       <dependency>
-                                 <groupId>io.netty</groupId>
-                                 <artifactId>netty-handler</artifactId>
-                                 <version>${project.nettyVersion}</version>
-                       </dependency>
-
-                       
-
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-log4j12</artifactId>
-                               <version>1.7.5</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>javax.mail</groupId>
-                               <artifactId>mail</artifactId>
-                               <version>1.4.7</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
-
-
-       
 
 </project>     

diff --git a/cadi/pom.xml b/cadi/pom.xml
index a194d0d..86c4b1f 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -33,28 +33,26 @@
                <name>ONAP</name>
        </organization>
        <packaging>pom</packaging>
-
        
        <properties>
+               <!-- SONAR -->
                <!-- <sonar.skip>true</sonar.skip> -->
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.jettyVersion>9.4.12.RC</project.jettyVersion>
-               <powermock.version>1.5.1</powermock.version>
-               <!--  SONAR  -->
-                <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 -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+               <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 -->
+               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+                       below -->
+               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
+       
 
        <!-- ============================================================== -->
        <!-- Define the major contributors and developers of CADI -->
@@ -100,27 +98,23 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -135,136 +129,6 @@
                <module>oauth-enduser</module>
        </modules>
 
-       <!-- ============================================================== -->
-       <!-- Define project-wide dependencies -->
-       <!-- ============================================================== -->
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-core</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-oauth</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-
-                       <!-- Prevent Cycles in Testing  -->
-                       <dependency>
-                               <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</groupId>
-                               <artifactId>aaf-cadi-jetty</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-cass</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-cadi-aaf</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <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</groupId>
-                               <artifactId>aaf-cadi-client</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-env</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-rosetta</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.onap.aaf.authz</groupId>
-                               <artifactId>aaf-misc-log4j</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-servlet</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-io</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-security</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-http</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-util</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-server</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
-                       <dependency>
-                           <groupId>javax.servlet</groupId>
-                           <artifactId>javax.servlet-api</artifactId>
-                               <version>3.0.1</version>
-                       </dependency>
-
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-api</artifactId>
-                               <version>1.7.5</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
 
        <!-- ============================================================== -->
        <!-- Define common plugins and make them available for all modules -->

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index 841bca7..02b5055 100644 (file)
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -33,6 +33,25 @@
        <name>AAF Misc Env</name>
        <packaging>jar</packaging>
 
+       <properties>
+               <!-- SONAR -->
+               <!-- <sonar.skip>true</sonar.skip> -->
+               <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 -->
+               <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+               <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
+               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+                       below -->
+               <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+       </properties>
+
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
@@ -69,25 +88,6 @@
                </developer>
        </developers>
 
-       <properties>
-       <!--  SONAR  -->
-       <!-- <sonar.skip>true</sonar.skip> -->
-       <scijava.jvm.version>1.8</scijava.jvm.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 -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
-       </properties>
-
        <!-- ============================================================== -->
        <!-- Define common plugins and make them available for all modules -->
        <!-- ============================================================== -->
@@ -294,30 +294,27 @@
                        <artifactId>log4j</artifactId>
                        <scope>compile</scope> <!-- Provides scope only, in case other users prefer another Logging Implementation -->
                </dependency>
+               
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>

diff --git a/misc/pom.xml b/misc/pom.xml
index eb1a6e8..daae211 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -27,35 +27,10 @@
        <artifactId>parent</artifactId>
        <version>2.1.2-SNAPSHOT</version>
     </parent>
-       <groupId>org.onap.aaf.authz</groupId>
        <artifactId>miscparent</artifactId>
        <name>AAF Misc Parent</name>
-       <version>2.1.2-SNAPSHOT</version>
        <packaging>pom</packaging>
 
-       
-       <properties>
-       <!--  SONAR  -->
-       <!-- <sonar.skip>true</sonar.skip> -->
-                <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 -->
-           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
-           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
-               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <powermock.version>1.5.1</powermock.version>
-               <nexusproxy>https://nexus.onap.org</nexusproxy>
-               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
-               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
-               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
-       </properties>
-
-
-
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
@@ -96,26 +71,22 @@
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
 
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-api-mockito</artifactId>
-                       <version>${powermock.version}</version>
                        <scope>test</scope>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
                        <artifactId>junit</artifactId>
-                       <version>4.10</version>
                        <scope>test</scope>
                </dependency>
        </dependencies>
@@ -319,22 +290,6 @@
                </pluginManagement>
        </build>
 
-       
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>log4j</groupId>
-                               <artifactId>log4j</artifactId>
-                               <version>1.2.17</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.slf4j</groupId>
-                               <artifactId>slf4j-log4j12</artifactId>
-                               <version>1.7.5</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
 
        <distributionManagement>
                <repository>

diff --git a/pom.xml b/pom.xml
index d206245..e5f1f79 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,17 @@
-<!--
- * ============LICENSE_START====================================================
- * org.onap.aaf
- * ===========================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===========================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END====================================================
- *
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<!-- * ============LICENSE_START==================================================== 
+       * org.onap.aaf * =========================================================================== 
+       * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. * =========================================================================== 
+       * Licensed under the Apache License, Version 2.0 (the "License"); * you may 
+       not use this file except in compliance with the License. * You may obtain 
+       a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * 
+       * Unless required by applicable law or agreed to in writing, software * distributed 
+       under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES 
+       OR CONDITIONS OF ANY KIND, either express or implied. * See the License for 
+       the specific language governing permissions and * limitations under the License. 
+       * ============LICENSE_END==================================================== 
+       * -->
+<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>
        <groupId>org.onap.aaf.authz</groupId>
@@ -30,7 +23,7 @@
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.1.0</version>
+               <version>1.2.0</version>
        </parent>
 
        <properties>
@@ -41,16 +34,24 @@
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
 
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
-               <!--  SONAR  -->
+               <!-- SONAR -->
                <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 -->
                <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
                <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
-               <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
+               <!-- Note: This list should match jacoco-maven-plugin's exclusion list 
+                       below -->
                <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <powermock.version>1.5.1</powermock.version>
+               <mockito.version>1.9.5</mockito.version>
+               <project.interfaceVersion>${project.version}</project.interfaceVersion>
+               <project.jettyVersion>9.4.11.v20180605</project.jettyVersion>
+               <project.guavaVersion>23.6.1-jre</project.guavaVersion>
+
        </properties>
        <build>
                <plugins>
@@ -142,6 +143,256 @@
                <module>auth</module>
        </modules>
 
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-misc-env</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-misc-log4j</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-misc-rosetta</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-misc-xgen</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       
+
+                       
+
+                       
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-client</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-core</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-cass</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-cmd</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-oauth</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-auth-deforg</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-cadi-core</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-cadi-client</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-cadi-aaf</artifactId>
+                               <version>${project.version}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.apache.cassandra</groupId>
+                                               <artifactId>cassandra-all</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-cadi-jetty</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.onap.aaf.authz</groupId>
+                               <artifactId>aaf-cadi-cass</artifactId>
+                               <version>${project.version}</version>
+                       </dependency><dependency>
+                               <groupId>javax.servlet</groupId>
+                               <artifactId>javax.servlet-api</artifactId>
+                               <version>3.0.1</version>
+                       </dependency><dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-servlet</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency><dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-server</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-io</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-security</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-http</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.eclipse.jetty</groupId>
+                               <artifactId>jetty-util</artifactId>
+                               <version>${project.jettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>slf4j-api</artifactId>
+                               <version>1.7.5</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>com.datastax.cassandra</groupId>
+                               <artifactId>cassandra-all</artifactId>
+                               <version>${project.cassVersion}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.slf4j</groupId>
+                                               <artifactId>slf4j-log4j12</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>log4j</groupId>
+                                               <artifactId>log4j</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>com.datastax.cassandra</groupId>
+                               <artifactId>cassandra-driver-core</artifactId>
+                               <version>${project.cassVersion}</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.slf4j</groupId>
+                                               <artifactId>slf4j-log4j12</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>log4j</groupId>
+                                               <artifactId>log4j</artifactId>
+                                       </exclusion>
+                                       <exclusion>
+                                               <groupId>com.google.guava</groupId>
+                                               <artifactId>guava</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+                       
+       
+                       <dependency>
+                               <groupId>com.google.guava</groupId>
+                               <artifactId>guava</artifactId>
+                               <version>${project.guavaVersion}</version>
+                       </dependency>
+                               
+       
+                       <!-- Note: Ensure DataStax uses more up-to-date netty handler -->
+                       <dependency>
+                               <groupId>io.netty</groupId>
+                               <artifactId>netty-handler</artifactId>
+                               <version>${project.nettyVersion}</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.slf4j</groupId>
+                               <artifactId>slf4j-log4j12</artifactId>
+                               <version>1.7.5</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>javax.mail</groupId>
+                               <artifactId>mail</artifactId>
+                               <version>1.4.7</version>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.mockito</groupId>
+                               <artifactId>mockito-all</artifactId>
+                               <version>${mockito.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+
+                       <dependency>
+                               <groupId>org.powermock</groupId>
+                               <artifactId>powermock-module-junit4</artifactId>
+                               <version>${powermock.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       
+                       <dependency>
+                               <groupId>org.powermock</groupId>
+                               <artifactId>powermock-api-mockito</artifactId>
+                               <version>${powermock.version}</version>
+                               <scope>test</scope>
+                       </dependency>
+                       
+                       <dependency>
+                               <groupId>log4j</groupId>
+                               <artifactId>log4j</artifactId>
+                               <version>1.2.17</version>
+                       </dependency>
+                       
+                       <dependency>
+                               <groupId>junit</groupId>
+                               <artifactId>junit</artifactId>
+                               <version>4.10</version>
+                               <scope>test</scope>
+                       </dependency>
+                       
+               </dependencies>
+       </dependencyManagement>
+
+
+
+
+
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>