Fix POMs

Issue-ID: AAF-225
Change-Id: I02140ea61604b5224477fe29114f89ffcd75086e
Signed-off-by: IanHowell <ian.howell@att.com>

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 69a5c5d..10a3bb0 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -42,6 +42,7 @@
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+               <project.bouncyCastleVersion>1.59</project.bouncyCastleVersion>
        </properties>
 
        <dependencies>
@@ -79,12 +80,12 @@
                <dependency>
                  <groupId>org.bouncycastle</groupId>
                  <artifactId>bcprov-jdk15on</artifactId>
-                 <version>1.59</version>
+                 <version>${project.bouncyCastleVersion}</version>
                </dependency>
                <dependency>
                        <groupId>org.bouncycastle</groupId>
                        <artifactId>bcpkix-jdk15on</artifactId>
-                       <version>1.59</version>
+                       <version>${project.bouncyCastleVersion}</version>
                </dependency>
        </dependencies>
 

diff --git a/auth/pom.xml b/auth/pom.xml
index 777480e..c3726b5 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -54,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>
@@ -484,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>
@@ -500,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>
@@ -517,7 +523,7 @@
                        <dependency>
                                  <groupId>io.netty</groupId>
                                  <artifactId>netty-handler</artifactId>
-                                 <version>4.1.22.Final</version>
+                                 <version>${project.nettyVersion}</version>
                        </dependency>