Pull in all pom changes, merge, and review

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

diff --git a/auth/pom.xml b/auth/pom.xml
index 9089291..f9a6c7c 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -28,12 +28,17 @@
        <version>2.1.0-SNAPSHOT</version>
        <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>
-               <skipTests>true</skipTests>
                <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
-               <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
-               <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
+               <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
+               <project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
                <!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
                <project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
                <powermock.version>1.5.1</powermock.version>
@@ -43,8 +48,8 @@
            <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
            <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
            <!-- Default Sonar configuration -->
-           <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
-           <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+           <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+           <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
            <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
            <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
                <nexusproxy>https://nexus.onap.org</nexusproxy>
@@ -107,7 +112,7 @@
                                        <artifactId>maven-deploy-plugin</artifactId>
                                        <version>2.6</version>
                                        <configuration>
-                                               <skip>true</skip>
+                                               <skip>false</skip>
                                        </configuration>
                                </plugin>
 
@@ -116,7 +121,7 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
+                                               <skipTests>false</skipTests>
 
                                                <includes>
                                                        <include>**/JU*.java</include>
@@ -132,7 +137,7 @@
                                        <artifactId>maven-failsafe-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
+                                               <skipTests>flase</skipTests>
                                        </configuration>
                                        <executions>
                                                <execution>
@@ -478,12 +483,6 @@
                                <version>${project.jettyVersion}</version>
                        </dependency>
 
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-jmx</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
                        <dependency>
                                <groupId>com.datastax.cassandra</groupId>
                                <artifactId>cassandra-all</artifactId>
@@ -499,11 +498,10 @@
                                        </exclusion>
                                </exclusions>
                        </dependency>
+
                        <dependency>
                                <groupId>com.datastax.cassandra</groupId>
                                <artifactId>cassandra-driver-core</artifactId>
-                               <!-- version>1.0.3</version -->
-                               <!-- version>1.0.5</version -->
                                <version>3.3.0</version>
                                <exclusions>
                                        <exclusion>