Beta Release for Clients

[aaf/authz.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e5f1f79..eca6d80 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,18 +16,19 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
-       <version>2.1.2-SNAPSHOT</version>
-       <name>AAF Overall Parent</name>
+       <version>2.1.2.beta1</version>
+       <name>aaf-authz</name>
        <packaging>pom</packaging>
 
        <parent>
                <groupId>org.onap.oparent</groupId>
                <artifactId>oparent</artifactId>
-               <version>1.2.0</version>
+               <version>1.2.1-SNAPSHOT</version>
        </parent>
 
        <properties>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
@@ -49,8 +50,8 @@
                <powermock.version>1.5.1</powermock.version>
                <mockito.version>1.9.5</mockito.version>
                <project.interfaceVersion>${project.version}</project.interfaceVersion>
-               <project.jettyVersion>9.4.11.v20180605</project.jettyVersion>
-               <project.guavaVersion>23.6.1-jre</project.guavaVersion>
+               <project.jettyVersion>9.4.12.v20180830</project.jettyVersion>
+               <project.cassVersion>3.6.0</project.cassVersion>
 
        </properties>
        <build>
@@ -249,7 +250,10 @@
                                <groupId>javax.servlet</groupId>
                                <artifactId>javax.servlet-api</artifactId>
                                <version>3.0.1</version>
-                       </dependency><dependency>
+                       </dependency>
+                       
+                       <!-- JettyVersion is partly covered in "OParent" 
+                         dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-servlet</artifactId>
                                <version>${project.jettyVersion}</version>
@@ -258,30 +262,32 @@
                                <artifactId>jetty-server</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-
+                       
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-io</artifactId>
+                               <artifactId>jetty-http</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
 
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-security</artifactId>
+                               <artifactId>jetty-io</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
 
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-http</artifactId>
+                               <artifactId>jetty-security</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
 
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-util</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
+                        -->
 
                        <dependency>
                                <groupId>org.slf4j</groupId>
@@ -324,15 +330,6 @@
                                        </exclusion>
                                </exclusions>
                        </dependency>
-                       
-       
-                       <dependency>
-                               <groupId>com.google.guava</groupId>
-                               <artifactId>guava</artifactId>
-                               <version>${project.guavaVersion}</version>
-                       </dependency>
-                               
-       
                        <!-- Note: Ensure DataStax uses more up-to-date netty handler -->
                        <dependency>
                                <groupId>io.netty</groupId>
@@ -351,7 +348,7 @@
                                <artifactId>mail</artifactId>
                                <version>1.4.7</version>
                        </dependency>
-
+                       
                        <dependency>
                                <groupId>org.mockito</groupId>
                                <artifactId>mockito-all</artifactId>