<parent>\r
<groupId>org.onap.aaf.authz</groupId>\r
<artifactId>parent</artifactId>\r
- <version>1.0.0-SNAPSHOT</version>\r
+ <version>1.0.1-SNAPSHOT</version>\r
<relativePath>../pom.xml</relativePath>\r
</parent>\r
\r
<properties>\r
<maven.test.failure.ignore>true</maven.test.failure.ignore>\r
<project.swmVersion>9</project.swmVersion>\r
- <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.cadiVersion>1.0.0-SNAPSHOT</project.cadiVersion>\r
+ <project.innoVersion>1.0.0-SNAPSHOT</project.innoVersion>\r
<sonar.language>java</sonar.language>\r
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>\r
<sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>\r
<sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath>\r
<sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>\r
- <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero>\r
+ <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>\r
<sonar.projectVersion>${project.version}</sonar.projectVersion>\r
<nexusproxy>https://nexus.onap.org</nexusproxy>\r
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>\r
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>\r
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>\r
- <sitePath>/content/sites/site/${project.groupId}/${project.artifactId}/${project.version}</sitePath>\r
+ <sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>\r
</properties>\r
\r
\r
<dependency> \r
<groupId>org.onap.aaf.cadi</groupId>\r
<artifactId>cadi-core</artifactId>\r
- <version>${project.version}</version>\r
+ <version>${project.cadiVersion}</version>\r
</dependency>\r
<dependency>\r
<groupId>com.att.aft</groupId>\r
</configuration>\r
<version>2.3.1</version>\r
</plugin>\r
-\r
- <plugin>\r
- <groupId>org.apache.maven.plugins</groupId>\r
- <artifactId>maven-deploy-plugin</artifactId>\r
- <configuration>\r
- <skip>true</skip>\r
- </configuration>\r
- </plugin>\r
- \r
\r
+ <plugin>\r
<groupId>org.apache.maven.plugins</groupId>\r
<artifactId>maven-javadoc-plugin</artifactId>\r
+ <version>2.10.4</version>\r
<configuration>\r
<failOnError>false</failOnError>\r
</configuration>\r
</configuration>\r
</plugin> \r
<plugin>\r
- <groupId>org.jacoco</groupId>\r
- <artifactId>jacoco-maven-plugin</artifactId>\r
- <version>0.7.7.201606060606</version>\r
- <configuration>\r
- <dumpOnExit>true</dumpOnExit>\r
- <includes>\r
- <include>org.onap.aaf.*</include>\r
- </includes>\r
- </configuration>\r
- <executions>\r
- <execution>\r
- <id>pre-unit-test</id>\r
- <goals>\r
- <goal>prepare-agent</goal>\r
- </goals>\r
- <configuration>\r
- <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
- <!-- <append>true</append> -->\r
- </configuration>\r
- </execution>\r
- <execution>\r
- <id>pre-integration-test</id>\r
- <phase>pre-integration-test</phase>\r
- <goals>\r
- <goal>prepare-agent</goal>\r
- </goals>\r
- <configuration>\r
- <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
- <!-- <append>true</append> -->\r
- </configuration>\r
- </execution>\r
- <execution>\r
- <goals>\r
- <goal>merge</goal>\r
- </goals>\r
- <phase>post-integration-test</phase>\r
- <configuration>\r
- <fileSets>\r
- <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
- <directory>${project.build.directory}/coverage-reports</directory>\r
- <includes>\r
- <include>*.exec</include>\r
- </includes>\r
- </fileSet>\r
- </fileSets>\r
- <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
- </configuration>\r
- </execution>\r
- </executions>\r
- </plugin>\r
+ <groupId>org.jacoco</groupId>\r
+ <artifactId>jacoco-maven-plugin</artifactId>\r
+ <version>${jacoco.version}</version>\r
+ <configuration>\r
+ <!-- Note: This exclusion list should match <sonar.exclusions>\r
+ property above -->\r
+ <excludes>\r
+ <exclude>**/gen/**</exclude>\r
+ <exclude>**/generated-sources/**</exclude>\r
+ <exclude>**/yang-gen/**</exclude>\r
+ <exclude>**/pax/**</exclude>\r
+ </excludes>\r
+ </configuration>\r
+ <executions>\r
+ <!--\r
+ Prepares the property pointing to the JaCoCo runtime agent which\r
+ is passed as VM argument when Maven the Surefire plugin is executed.\r
+ -->\r
+ <execution>\r
+ <id>pre-unit-test</id>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <!-- Sets the path to the file which contains the execution data. -->\r
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
+ <!--\r
+ Sets the name of the property containing the settings\r
+ for JaCoCo runtime agent.\r
+ -->\r
+ <propertyName>surefireArgLine</propertyName>\r
+ </configuration>\r
+ </execution>\r
+ <!--\r
+ Ensures that the code coverage report for unit tests is created after\r
+ unit tests have been run.\r
+ -->\r
+ <execution>\r
+ <id>post-unit-test</id>\r
+ <phase>test</phase>\r
+ <goals>\r
+ <goal>report</goal>\r
+ </goals>\r
+ <configuration>\r
+ <!-- Sets the path to the file which contains the execution data. -->\r
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
+ <!-- Sets the output directory for the code coverage report. -->\r
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
+ </configuration>\r
+ </execution>\r
+ <execution>\r
+ <id>pre-integration-test</id>\r
+ <phase>pre-integration-test</phase>\r
+ <goals>\r
+ <goal>prepare-agent</goal>\r
+ </goals>\r
+ <configuration>\r
+ <!-- Sets the path to the file which contains the execution data. -->\r
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
+ <!--\r
+ Sets the name of the property containing the settings\r
+ for JaCoCo runtime agent.\r
+ -->\r
+ <propertyName>failsafeArgLine</propertyName>\r
+ </configuration>\r
+ </execution>\r
+ <!--\r
+ Ensures that the code coverage report for integration tests after\r
+ integration tests have been run.\r
+ -->\r
+ <execution>\r
+ <id>post-integration-test</id>\r
+ <phase>post-integration-test</phase>\r
+ <goals>\r
+ <goal>report</goal>\r
+ </goals>\r
+ <configuration>\r
+ <!-- Sets the path to the file which contains the execution data. -->\r
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
+ <!-- Sets the output directory for the code coverage report. -->\r
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
+ </configuration>\r
+ </execution>\r
+ </executions>\r
+ </plugin> \r
+\r
</plugins>\r
\r
</build>\r
<url>dav:${nexusproxy}${sitePath}</url>\r
</site>\r
</distributionManagement>\r
-<pluginRepositories>\r
- <pluginRepository>\r
- <id>onap-plugin-snapshots</id>\r
- <url>https://nexus.onap.org/content/repositories/snapshots/</url>\r
- </pluginRepository>\r
- </pluginRepositories>\r
- \r
- <repositories>\r
- <repository>\r
- <id>central</id>\r
- <name>Maven 2 repository 2</name>\r
- <url>http://repo2.maven.org/maven2/</url>\r
- </repository>\r
- <repository>\r
- <id>onap-jar-snapshots</id>\r
- <url>https://nexus.onap.org/content/repositories/snapshots</url>\r
- </repository>\r
- <repository>\r
- <id>spring-repo</id>\r
- <name>Spring repo</name>\r
- <url>https://artifacts.alfresco.com/nexus/content/repositories/public/</url>\r
- </repository>\r
- <repository>\r
- <id>repository.jboss.org-public</id>\r
- <name>JBoss.org Maven repository</name>\r
- <url>https://repository.jboss.org/nexus/content/groups/public</url>\r
- </repository>\r
- </repositories>\r
+\r
</project>\r
Code Review / aaf / authz.git / blobdiff