Pull in all pom changes, merge, and review
[aaf/authz.git] / cadi / pom.xml
index 56cf399..b6f1262 100644 (file)
        <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>             
+   <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.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>
@@ -50,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>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-all</artifactId>
-                       <version>1.9.5</version>
+                       <version>1.9.5</version>
                        <scope>test</scope>
                </dependency>
-       
+
                <dependency>
                        <groupId>org.powermock</groupId>
                        <artifactId>powermock-module-junit4</artifactId>
                <module>client</module>
                <module>aaf</module>
                <module>cass</module>
-               
                <module>oauth-enduser</module>
                <module>shiro</module>
        </modules>
                                <artifactId>jetty-servlet</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-                       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-io</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-security</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-http</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-util</artifactId>
                                <version>${project.jettyVersion}</version>
                        </dependency>
-       
+
                        <dependency>
                                <groupId>org.eclipse.jetty</groupId>
                                <artifactId>jetty-server</artifactId>
                            <artifactId>servlet-api</artifactId>
                                <version>2.5</version>
                        </dependency>
-                       
+
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>slf4j-api</artifactId>
                <testSourceDirectory>src/test/java</testSourceDirectory>
                <plugins>
                </plugins>
-               <pluginManagement>                      
+               <pluginManagement>
                        <plugins>
                                <plugin>
                                        <inherited>true</inherited>
                                                <target>1.7</target>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <version>2.4</version>
                                                <excludePackageNames>org.opendaylight.*</excludePackageNames>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.5.2</version>
                                                <goals>-s ${mvn.settings} deploy</goals>
                                        </configuration>
                                </plugin>
-       
+
                                <plugin>
                                        <artifactId>maven-assembly-plugin</artifactId>
                                        <version>2.5.5</version>
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-deploy-plugin</artifactId>
                                        <version>2.8.1</version>
                                        <configuration>
-                                               <skip>true</skip>
+                                               <skip>false</skip>
                                        </configuration>
-       
+
                                </plugin>
-       
+
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-dependency-plugin</artifactId>
                                        <version>2.10</version>
                                </plugin>
-       
+
                                <!-- Maven surefire plugin for testing -->
                                <plugin>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
+                                               <skipTests>false</skipTests>
+                                               <includes>
+                                                       <include>**/JU*.java</include>
+                                               </includes>
+                                               <excludes>
+                                               </excludes>
                                        </configuration>
                                </plugin>
-                               
-                               <!--This plugin's configuration is used to store Eclipse m2e settings 
+
+                               <!--This plugin's configuration is used to store Eclipse m2e settings
                                        only. It has no influence on the Maven build itself. -->
                                <plugin>
                                        <groupId>org.eclipse.m2e</groupId>
                                                </lifecycleMappingMetadata>
                                        </configuration>
                                </plugin>
-                                                               <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>${nexusproxy}</nexusUrl>
-                                       <stagingProfileId>176c31dfe190a</stagingProfileId>
-                                       <serverId>ecomp-staging</serverId>
-                               </configuration>
-                       </plugin>               
-                       <plugin>
-                               <groupId>org.jacoco</groupId>
-                               <artifactId>jacoco-maven-plugin</artifactId>
-                               <version>0.7.7.201606060606</version>
-                               <configuration>
-                                       <dumpOnExit>true</dumpOnExit>
-                                       <includes>
-                                               <include>org.onap.aaf.*</include>
-                                       </includes>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>pre-unit-test</id>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <id>pre-integration-test</id>
-                                               <phase>pre-integration-test</phase>
-                                               <goals>
-                                                       <goal>prepare-agent</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
-                               </executions>
-                       </plugin>
+                               <plugin>
+                                       <groupId>org.sonatype.plugins</groupId>
+                                       <artifactId>nexus-staging-maven-plugin</artifactId>
+                                       <version>1.6.7</version>
+                                       <extensions>true</extensions>
+                                       <configuration>
+                                               <nexusUrl>${nexusproxy}</nexusUrl>
+                                               <stagingProfileId>176c31dfe190a</stagingProfileId>
+                                               <serverId>ecomp-staging</serverId>
+                                       </configuration>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.jacoco</groupId>
+                                       <artifactId>jacoco-maven-plugin</artifactId>
+                                       <version>${jacoco.version}</version>
+                                       <configuration>
+                                               <excludes>
+                                                       <exclude>**/gen/**</exclude>
+                                                       <exclude>**/generated-sources/**</exclude>
+                                                       <exclude>**/yang-gen/**</exclude>
+                                                       <exclude>**/pax/**</exclude>
+                                               </excludes>
+                                       </configuration>
+                                       <executions>
+                                               <execution>
+                                                       <id>pre-unit-test</id>
+                                                       <goals>
+                                                               <goal>prepare-agent</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+                                                               <propertyName>surefireArgLine</propertyName>
+                                                       </configuration>
+                                               </execution>
+                                               <execution>
+                                                       <id>post-unit-test</id>
+                                                       <phase>test</phase>
+                                                       <goals>
+                                                               <goal>report</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                                                       </configuration>
+                                               </execution>
+                                               <execution>
+                                                       <id>pre-integration-test</id>
+                                                       <phase>pre-integration-test</phase>
+                                                       <goals>
+                                                               <goal>prepare-agent</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                               <propertyName>failsafeArgLine</propertyName>
+                                                       </configuration>
+                                               </execution>
+                                               <execution>
+                                                       <id>post-integration-test</id>
+                                                       <phase>post-integration-test</phase>
+                                                       <goals>
+                                                               <goal>report</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+                                                               <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </plugin>
                        </plugins>
-               </pluginManagement>                     
+               </pluginManagement>
        </build>
 
-
        <distributionManagement>
                <repository>
                        <id>ecomp-releases</id>
                        <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-       
+
 </project>