Update to 2.1.11-SNAPSHOT

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

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 55be383..db940ba 100644 (file)
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -23,10 +23,10 @@
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-               <artifactId>parent</artifactId>
+               <artifactId>authparent</artifactId>
                <relativePath>../pom.xml</relativePath>
-               <groupId>org.onap.aaf.auth</groupId>
-               <version>2.1.0-SNAPSHOT</version>
+               <groupId>org.onap.aaf.authz</groupId>
+               <version>2.1.11-SNAPSHOT</version>
        </parent>
 
        <artifactId>aaf-auth-deforg</artifactId>
@@ -74,14 +74,15 @@
        <properties>
                <maven.test.failure.ignore>false</maven.test.failure.ignore>
                <!--  SONAR  -->
+               <!-- <sonar.skip>true</sonar.skip> -->
                 <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>
-           <!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
-           <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+               <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+               <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+               <!-- Default Sonar configuration -->
+               <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>
                <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
                <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -92,24 +93,27 @@
 
        <dependencies>
                <dependency>
-                       <groupId>org.onap.aaf.cadi</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-cadi-core</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>org.onap.aaf.auth</groupId>
+                       <groupId>org.onap.aaf.authz</groupId>
                        <artifactId>aaf-auth-core</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>javax.mail</groupId>
-                       <artifactId>mail</artifactId>
-               </dependency>
        </dependencies>
 
        <build>
                <pluginManagement>
                        <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-deploy-plugin</artifactId>
+                               <configuration>
+                                       <skip>false</skip>
+                               </configuration>
+                       </plugin>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-javadoc-plugin</artifactId>
@@ -150,7 +154,6 @@
                                                </excludes>
                                        </configuration>
                                        <executions>
-
                                                <execution>
                                                        <id>pre-unit-test</id>
                                                        <goals>
@@ -161,8 +164,6 @@
                                                                <propertyName>surefireArgLine</propertyName>
                                                        </configuration>
                                                </execution>
-
-
                                                <execution>
                                                        <id>post-unit-test</id>
                                                        <phase>test</phase>
@@ -172,6 +173,9 @@
                                                        <configuration>
                                                                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
                                                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                                                               <includes>
+                                                                       <include>**</include>
+                                                               </includes>
                                                        </configuration>
                                                </execution>
                                                <execution>
@@ -182,10 +186,12 @@
                                                        </goals>
                                                        <configuration>
                                                                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+                                                               <includes>
+                                                                       <include>**</include>
+                                                               </includes>
                                                                <propertyName>failsafeArgLine</propertyName>
                                                        </configuration>
                                                </execution>
-
                                                <execution>
                                                        <id>post-integration-test</id>
                                                        <phase>post-integration-test</phase>
@@ -199,68 +205,6 @@
                                                </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>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>
                        </plugins>
                </pluginManagement>
        </build>