Change Beijing Release to 2.1.1

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

diff --git a/auth/pom.xml b/auth/pom.xml
index fc4c8e0..f543c79 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -26,18 +26,16 @@
        <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.1.1-SNAPSHOT</version>
     </parent>
-       <groupId>org.onap.aaf.authz</groupId>
        <artifactId>authparent</artifactId>
-       <version>2.1.0-SNAPSHOT</version>
        <name>AAF Auth Parent</name>
        <packaging>pom</packaging>
 
        
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.interfaceVersion>2.10-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>
@@ -55,7 +53,13 @@
                <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>
+               <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>
@@ -486,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>
@@ -502,7 +506,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>
@@ -514,6 +518,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>