Make Container Config Strategy

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

diff --git a/auth/pom.xml b/auth/pom.xml
index 7372028..8e6045c 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -23,26 +23,21 @@
        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.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.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>
+               <project.jettyVersion>9.4.11.v20180605</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>
                <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
                <!--  SONAR  -->
@@ -59,6 +54,10 @@
                <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.project.ext_root_dir>/opt/app/osaaf</project.project.ext_root_dir>
        </properties>
 
        <developers>
@@ -437,7 +436,7 @@
                                <artifactId>aaf-auth-client</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-
+                       
                        <dependency>
                                <groupId>org.onap.aaf.authz</groupId>
                                <artifactId>aaf-auth-core</artifactId>
@@ -489,7 +488,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 +504,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 +521,7 @@
                        <dependency>
                                  <groupId>io.netty</groupId>
                                  <artifactId>netty-handler</artifactId>
-                                 <version>4.1.22.Final</version>
+                                 <version>${project.nettyVersion}</version>
                        </dependency>