updated the poms with project versions

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

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 862743c..7477367 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -21,27 +21,25 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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>
+    <groupId>org.onap.aaf.authz</groupId>
+    <artifactId>super-pom</artifactId>
+    <version>2.1.0-SNAPSHOT</version>
+    </parent>
        <groupId>org.onap.aaf.authz.cadi</groupId>
        <artifactId>parent</artifactId>
        <name>AAF CADI Parent (Code, Access, Data, Identity)</name>
-       <version>1.5.0-SNAPSHOT</version>
+       <version>2.1.0-SNAPSHOT</version>
        <inceptionYear>2015-07-20</inceptionYear>
        <organization>
                <name>ONAP</name>
        </organization>
        <packaging>pom</packaging>
 
-   <parent>
-        <groupId>org.onap.oparent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>1.1.0</version>
-    </parent>
-
+       
        <properties>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
-               <project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
                <project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>
                <!--  SONAR  -->
@@ -57,7 +55,7 @@
                <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/cadi/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
        <!-- ============================================================== -->
@@ -136,7 +134,6 @@
                <module>core</module>
                <module>client</module>
                <module>aaf</module>
-               <module>cass</module>
                <module>oauth-enduser</module>
                <module>shiro</module>
        </modules>
@@ -149,7 +146,7 @@
                        <dependency>
                                <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-client</artifactId>
-                               <version>${project.authClientVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
@@ -207,19 +204,19 @@
                        <dependency>
                                <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-env</artifactId>
-                               <version>${project.miscVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
                                <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-rosetta</artifactId>
-                               <version>${project.miscVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
                                <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-log4j</artifactId>
-                               <version>${project.miscVersion}</version>
+                               <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
@@ -260,8 +257,8 @@
 
                        <dependency>
                            <groupId>javax.servlet</groupId>
-                           <artifactId>servlet-api</artifactId>
-                               <version>2.5</version>
+                           <artifactId>javax.servlet-api</artifactId>
+                               <version>3.0.1</version>
                        </dependency>
 
                        <dependency>
@@ -350,6 +347,12 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>