<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>
- <version>1.5.0-SNAPSHOT</version>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<properties>
<!-- 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>
+ <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>
+ <sitePath>/content/sites/site/org.onap.aaf.authz/${project.artifactId}/${project.version}</sitePath>
</properties>
<developers>
<developer>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<extensions>true</extensions>
<stagingProfileId>176c31dfe190a</stagingProfileId>
<serverId>ecomp-staging</serverId>
</configuration>
- </plugin>
+ </plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</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>
- <!-- We want to create a Jar with Rosetta built in (since I don't want
- a separate deployment at this time Use this one as the jar to put in SWM
- packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>
- <classifier>tests</classifier> <archive> <manifest> <mainClass>org.onap.aaf.cadi.cm.CmAgent</mainClass>
- </manifest> <manifestEntries> <Sealed>true</Sealed> </manifestEntries> </archive>
- </configuration> <executions> <execution> <id>full</id> <phase>package</phase>
- <goals> <goal>single</goal> </goals> <configuration> <descriptors> <descriptor>src/assemble/cadi-aaf.xml</descriptor>
+ <!-- We want to create a Jar with Rosetta built in (since I don't want
+ a separate deployment at this time Use this one as the jar to put in SWM
+ packages <plugin> <artifactId>maven-assembly-plugin</artifactId> <configuration>
+ <classifier>tests</classifier> <archive> <manifest> <mainClass>org.onap.aaf.cadi.cm.CmAgent</mainClass>
+ </manifest> <manifestEntries> <Sealed>true</Sealed> </manifestEntries> </archive>
+ </configuration> <executions> <execution> <id>full</id> <phase>package</phase>
+ <goals> <goal>single</goal> </goals> <configuration> <descriptors> <descriptor>src/assemble/cadi-aaf.xml</descriptor>
</descriptors> </configuration> </execution> </executions> </plugin> -->
</plugins>
</build>
-
+
<distributionManagement>
<repository>
<id>ecomp-releases</id>