X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fpom.xml;h=e3ec9c08504615096b86c05eb0b2528053067f6e;hb=6d8972660b8806a36a4cdc87d1df086b7e34a501;hp=99d864dd49f9d6ac5ea0f5917997ffadb82d2c89;hpb=103d3ca78423b8c90be7ab3ce76c7144f31476d7;p=aaf%2Fauthz.git

diff --git a/auth/pom.xml b/auth/pom.xml
index 99d864dd..e3ec9c08 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,24 +23,22 @@
 	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.auth</groupId>
-	<artifactId>parent</artifactId>
-	<version>2.1.0-SNAPSHOT</version>
+	<parent>
+        <groupId>org.onap.aaf.authz</groupId>
+        <artifactId>parent</artifactId>
+        <version>2.1.2-SNAPSHOT</version>
+    </parent>
+	<artifactId>authparent</artifactId>
 	<name>AAF Auth Parent</name>
 	<packaging>pom</packaging>
+
 	
-	<parent>             
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
-		<project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
-		<project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
+		<project.interfaceVersion>2.1.1-SNAPSHOT</project.interfaceVersion>
 		<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
-		<project.jettyVersion>9.4.8.v20171121</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  -->
@@ -56,7 +54,11 @@
 		<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
-		<sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+		<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+		<!-- We have to up these versions from the original to avoid Security Errors -->
+		<project.cassVersion>3.4.0</project.cassVersion>
+		<project.nettyVersion>4.1.22.Final</project.nettyVersion>
+		<project.project.ext_root_dir>/opt/app/osaaf</project.project.ext_root_dir>
 	</properties>
 
 	<developers>
@@ -383,45 +385,45 @@
 	<dependencyManagement>
 		<dependencies>
 			<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-log4j</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-xgen</artifactId>
-				<version>${project.miscVersion}</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.cadiVersion}</version>
+				<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.cadiVersion}</version>
+				<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.cadiVersion}</version>
+				<version>${project.version}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.apache.cassandra</groupId>
@@ -431,37 +433,37 @@
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-client</artifactId>
-				<version>${project.interfaceVersion}</version>
+				<version>${project.version}</version>
 			</dependency>
-
+			
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-core</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-cass</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-cmd</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-oauth</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.onap.aaf.authz.auth</groupId>
+				<groupId>org.onap.aaf.authz</groupId>
 				<artifactId>aaf-auth-deforg</artifactId>
 				<version>${project.version}</version>
 			</dependency>
@@ -487,7 +489,7 @@
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-all</artifactId>
-				<version>3.3.0</version>
+				<version>${project.cassVersion}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.slf4j</groupId>
@@ -503,7 +505,7 @@
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-driver-core</artifactId>
-				<version>3.3.0</version>
+				<version>${project.cassVersion}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.slf4j</groupId>
@@ -515,6 +517,15 @@
 					</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>
@@ -525,7 +536,7 @@
 			<dependency>
 				<groupId>javax.mail</groupId>
 				<artifactId>mail</artifactId>
-				<version>1.4.5</version>
+				<version>1.4.7</version>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>