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 7be3406..f9a6c7c 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -28,11 +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>
                <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>
@@ -42,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>
@@ -106,7 +112,7 @@
                                        <artifactId>maven-deploy-plugin</artifactId>
                                        <version>2.6</version>
                                        <configuration>
-                                               <skip>true</skip>
+                                               <skip>false</skip>
                                        </configuration>
                                </plugin>