Move AAF/CADI Poms to 2.1.2
[aaf/authz.git] / cadi / core / pom.xml
index 6a46174..f7ad1a7 100644 (file)
@@ -1,22 +1,22 @@
-<!-- * ============LICENSE_START==================================================== 
-       * org.onap.aaf * =========================================================================== 
-       * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. * =========================================================================== 
-       * Licensed under the Apache License, Version 2.0 (the "License"); * you may 
-       not use this file except in compliance with the License. * You may obtain 
-       a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * 
-       * Unless required by applicable law or agreed to in writing, software * distributed 
-       under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES 
-       OR CONDITIONS OF ANY KIND, either express or implied. * See the License for 
-       the specific language governing permissions and * limitations under the License. 
-       * ============LICENSE_END==================================================== 
+<!-- * ============LICENSE_START====================================================
+       * org.onap.aaf * ===========================================================================
+       * Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. * ===========================================================================
+       * Licensed under the Apache License, Version 2.0 (the "License"); * you may
+       not use this file except in compliance with the License. * You may obtain
+       a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 *
+       * Unless required by applicable law or agreed to in writing, software * distributed
+       under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES
+       OR CONDITIONS OF ANY KIND, either express or implied. * See the License for
+       the specific language governing permissions and * limitations under the License.
+       * ============LICENSE_END====================================================
        * -->
 <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">
        <parent>
-               <groupId>org.onap.aaf.cadi</groupId>
-               <artifactId>parent</artifactId>
+               <groupId>org.onap.aaf.authz</groupId>
+               <artifactId>cadiparent</artifactId>
                <relativePath>..</relativePath>
-               <version>1.5.0-SNAPSHOT</version>
+               <version>2.1.2-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
 
        <properties>
        <!--  SONAR  -->
-                <jacoco.version>0.7.7.201606060606</jacoco.version>
+               <jacoco.version>0.7.7.201606060606</jacoco.version>
            <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>
@@ -40,7 +40,7 @@
                <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
                <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
-       
+
        <developers>
                <developer>
                        <name>Jonathan Gathman</name>
        <dependencies>
                <dependency>
                        <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
+                       <artifactId>javax.servlet-api</artifactId>
                        <scope>provided</scope>
                </dependency>
        </dependencies>
        <build>
                <plugins>
                        <plugin>
-                               <!-- Must put this in to turn on Signing, but Configuration itself is 
+                               <!-- Must put this in to turn on Signing, but Configuration itself is
                                        in Parent -->
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-jarsigner-plugin</artifactId>
                                <version>1.4</version>
-                               
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                        </execution>
                                </executions>
                        </plugin>
-                                                       <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>
                        <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>
+                                       <excludes>
+                                               <exclude>**/gen/**</exclude>
+                                               <exclude>**/generated-sources/**</exclude>
+                                               <exclude>**/yang-gen/**</exclude>
+                                               <exclude>**/pax/**</exclude>
+                                       </excludes>
                                </configuration>
                                <executions>
                                        <execution>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <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>
                                                        <goal>prepare-agent</goal>
                                                </goals>
                                                <configuration>
-                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-                                                       <!-- <append>true</append> -->
+                                                       <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                       <propertyName>failsafeArgLine</propertyName>
                                                </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>
+                                               <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>