Pull in all pom changes, merge, and review
[aaf/authz.git] / auth / pom.xml
index bf3a9ac..f9a6c7c 100644 (file)
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
        <modelVersion>4.0.0</modelVersion>
-       <groupId>org.onap.aaf.auth</groupId>
+       <groupId>org.onap.aaf.authz.auth</groupId>
        <artifactId>parent</artifactId>
        <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>
-               <skipTests>true</skipTests>
                <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>
                <project.conf_dir>/opt/app/osaaf/etc</project.conf_dir>
+               <!--  SONAR  -->
+                <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.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>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+               <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
        </properties>
 
        <developers>
                                        <artifactId>maven-surefire-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>${skipTests}</skipTests>
+                                               <skipTests>false</skipTests>
+
                                                <includes>
                                                        <include>**/JU*.java</include>
                                                </includes>
                                        <artifactId>maven-failsafe-plugin</artifactId>
                                        <version>2.17</version>
                                        <configuration>
-                                               <skipTests>true</skipTests>
+                                               <skipTests>flase</skipTests>
                                        </configuration>
                                        <executions>
                                                <execution>
                                                </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>
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-env</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-log4j</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-rosetta</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.misc</groupId>
+                               <groupId>org.onap.aaf.authz.misc</groupId>
                                <artifactId>aaf-misc-xgen</artifactId>
                                <version>${project.miscVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-core</artifactId>
                                <version>${project.cadiVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-client</artifactId>
                                <version>${project.cadiVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.cadi</groupId>
+                               <groupId>org.onap.aaf.authz.cadi</groupId>
                                <artifactId>aaf-cadi-aaf</artifactId>
                                <version>${project.cadiVersion}</version>
                                <exclusions>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-client</artifactId>
                                <version>${project.interfaceVersion}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-core</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-cass</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-cmd</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-oauth</artifactId>
                                <version>${project.version}</version>
                        </dependency>
 
                        <dependency>
-                               <groupId>org.onap.aaf.auth</groupId>
+                               <groupId>org.onap.aaf.authz.auth</groupId>
                                <artifactId>aaf-auth-deforg</artifactId>
                                <version>${project.version}</version>
                        </dependency>
                                <version>${project.jettyVersion}</version>
                        </dependency>
 
-                       <dependency>
-                               <groupId>org.eclipse.jetty</groupId>
-                               <artifactId>jetty-jmx</artifactId>
-                               <version>${project.jettyVersion}</version>
-                       </dependency>
-
                        <dependency>
                                <groupId>com.datastax.cassandra</groupId>
                                <artifactId>cassandra-all</artifactId>
                                        </exclusion>
                                </exclusions>
                        </dependency>
+
                        <dependency>
                                <groupId>com.datastax.cassandra</groupId>
                                <artifactId>cassandra-driver-core</artifactId>
-                               <!-- version>1.0.3</version -->
-                               <!-- version>1.0.5</version -->
                                <version>3.3.0</version>
                                <exclusions>
                                        <exclusion>