diff options
Diffstat (limited to 'ajsc-aai/pom.xml')
-rw-r--r-- | ajsc-aai/pom.xml | 73 |
1 files changed, 32 insertions, 41 deletions
diff --git a/ajsc-aai/pom.xml b/ajsc-aai/pom.xml index 0bf6c6d..9176bba 100644 --- a/ajsc-aai/pom.xml +++ b/ajsc-aai/pom.xml @@ -16,11 +16,12 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <skipTests>false</skipTests> <!-- sonar properties --> - <sonar.jacoco.reportPath>${basedir}/target/jacoco.exec</sonar.jacoco.reportPath> - <sonar.language>java</sonar.language> - <sonar.jacoco.reportMissing.force.zero>true</sonar.jacoco.reportMissing.force.zero> - <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> - <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> + <sonar.language>java</sonar.language> + <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin> + <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> + <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco.exec</sonar.jacoco.reportPath> + <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero> + <sonar.projectVersion>${project.version}</sonar.projectVersion> </properties> <dependencies> <!-- AJSC related dependencies --> @@ -348,16 +349,32 @@ </dependencies> <build> <finalName>aai</finalName> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.sonarsource.scanner.maven</groupId> - <artifactId>sonar-maven-plugin</artifactId> - <version>3.0.2</version> - </plugin> - </plugins> - </pluginManagement> <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>sonar-maven-plugin</artifactId> + <version>3.2</version> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.7.201606060606</version> + <configuration> + <dumpOnExit>true</dumpOnExit> + </configuration> + <executions> + <execution> + <id>jacoco-initialize-unit-tests</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <configuration> + <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile> + <!-- <append>true</append> --> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -425,31 +442,6 @@ </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.openecomp.*</include> - </includes> - </configuration> - <executions> - <execution> - <configuration> - <destFile>${sonar.jacoco.reportPath}</destFile> - </configuration> - <id>pre-test</id> - <phase>process-test-classes</phase> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <!-- we want to execute jacoco:prepare-agent-integration in test phase, - but before executing maven failsafe plugin --> - </executions> - </plugin> - <plugin> <groupId>org.jvnet.jaxb2.maven2</groupId> <artifactId>maven-jaxb2-plugin</artifactId> <version>0.13.1</version> @@ -608,8 +600,7 @@ <skipTests>${skipTests}</skipTests> <reuseForks>false</reuseForks> <threadCount>1</threadCount> - <argLine>-javaagent:${project.build.directory}/agents/powermock-javaagent.jar - -noverify ${argLine}</argLine> + <argLine>-noverify ${argLine}</argLine> <systemPropertyVariables> <AJSC_HOME>.</AJSC_HOME> <BUNDLECONFIG_DIR>bundleconfig-local</BUNDLECONFIG_DIR> |