Pull in all pom changes, merge, and review

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

diff --git a/cadi/pom.xml b/cadi/pom.xml
index a9d8a99..b6f1262 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -24,7 +24,7 @@
        <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>
@@ -40,7 +40,7 @@
        <properties>
                <skipSigning>true</skipSigning>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
+               <project.miscVersion>2.1.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>
@@ -49,8 +49,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>
@@ -350,6 +350,12 @@
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>