X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fpom.xml;h=f543c794877d82b9944a7a28b434b48ae7d2e804;hb=a97d731d65bb988e12495d7f9fa6565097c78e26;hp=73720284c5c518a2d40e490b287e0539b0890200;hpb=a933f226711eb22d680f6a722bfc33c124b53695;p=aaf%2Fauthz.git

diff --git a/auth/pom.xml b/auth/pom.xml
index 73720284..f543c794 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,24 +23,19 @@
 	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>
+	<parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-    </parent> -->
+        <version>2.1.1-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.1.0-SNAPSHOT</project.interfaceVersion>
+		<project.interfaceVersion>2.1.1-SNAPSHOT</project.interfaceVersion>
 		<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
 		<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
 		<powermock.version>1.5.1</powermock.version>
@@ -59,6 +54,12 @@
 		<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
 		<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
 		<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.cassVersion>3.3.0</project.cassVersion>
+		<project.nettyVersion>4.0.47.Final</project.nettyVersion> -->
 	</properties>
 
 	<developers>
@@ -489,7 +490,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>
@@ -505,7 +506,7 @@
 			<dependency>
 				<groupId>com.datastax.cassandra</groupId>
 				<artifactId>cassandra-driver-core</artifactId>
-				<version>3.4.0</version>
+				<version>${project.cassVersion}</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.slf4j</groupId>
@@ -522,7 +523,7 @@
 			<dependency>
 				  <groupId>io.netty</groupId>
 				  <artifactId>netty-handler</artifactId>
-				  <version>4.1.22.Final</version>
+				  <version>${project.nettyVersion}</version>
 			</dependency>