diff options
Diffstat (limited to 'ecomp-portal-BE-os/pom.xml')
| -rw-r--r-- | ecomp-portal-BE-os/pom.xml | 184 |
1 files changed, 99 insertions, 85 deletions
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml index 00e77c20..0a45000f 100644 --- a/ecomp-portal-BE-os/pom.xml +++ b/ecomp-portal-BE-os/pom.xml @@ -18,11 +18,11 @@ <!-- If skipTests is false use this command to generate the report: mvn clean jacoco:prepare-agent install jacoco:report --> <skipTests>false</skipTests> - <skipCoverage>true</skipCoverage> + <skipCoverage>false</skipCoverage> <jacoco.data.file>${project.build.directory}/coverage-reports/jacoco-ut.exec</jacoco.data.file> <sonar-jacoco-listeners.version>3.8</sonar-jacoco-listeners.version> <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath> + <sonar.jacoco.reportPath>${project.build.directory}/code-coverage/jacoco.exec</sonar.jacoco.reportPath> <sonar.jacoco.itReportPath>${project.build.directory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath> <!-- Note: This list should match jacoco-maven-plugin's exclusion list below --> <sonar.exclusions>**.js</sonar.exclusions> @@ -85,63 +85,67 @@ <target>1.8</target> </configuration> </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.5.201505241946</version> - <executions> - <!-- Prepares the property pointing to the JaCoCo runtime agent which - is passed as VM argument when Maven the Surefire plugin is executed. --> - <execution> - <id>pre-unit-test</id> - <goals> - <goal>prepare-agent</goal> - </goals> - <configuration> - <!-- path to the file which contains the execution data. --> - <destFile>${jacoco.data.file}</destFile> - <!-- name of the property containing the settings for JaCoCo runtime agent. --> - <propertyName>surefireArgLine</propertyName> - <skip>${skipCoverage}</skip> - </configuration> - </execution> - <!-- Ensures that the code coverage report for unit tests is created - after unit tests have been run. --> - <execution> - <id>post-unit-test</id> - <phase>test</phase> - <goals> - <goal>report</goal> - </goals> - <configuration> - <!-- path to the file which contains the execution data. --> - <dataFile>${jacoco.data.file}</dataFile> - <!-- output directory for the code coverage report. --> - <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> - <skip>${skipCoverage}</skip> - </configuration> - </execution> - <!-- Will see build errors while running the test cases because of dual - instrumentation --> - <execution> - <id>default-instrument</id> - <goals> - <goal>instrument</goal> - </goals> - <configuration> - <skip>${skipCoverage}</skip> - </configuration> - </execution> - <execution> - <id>default-restore-instrumented-classes</id> - <goals> - <goal>restore-instrumented-classes</goal> - </goals> - <configuration> - <skip>${skipCoverage}</skip> - </configuration> - </execution> - </executions> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.7.6.201602180812</version> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + <phase>test</phase> + <configuration> + <destFile>${sonar.jacoco.reportPath}</destFile> + <skip>${skipCoverage}</skip> + </configuration> + </execution> + <execution> + <id>report</id> + <goals> + <goal>report</goal> + </goals> + <phase>test</phase> + <configuration> + <dataFile>${sonar.jacoco.reportPath}</dataFile> + <outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory> + <skip>${skipCoverage}</skip> + </configuration> + </execution> + <!-- Integration Tests (Only report goal) --> + <execution> + <id>report-integration</id> + <goals> + <goal>report-integration</goal> + </goals> + <configuration> + <dataFile>${sonar.jacoco.itReportPath}</dataFile> + <outputDirectory>${project.basedir}/target/site/it-jacoco</outputDirectory> + <skip>${skipCoverage}</skip> + </configuration> + </execution> + <!-- Will see build errors while running the test cases because of dual + instrumentation --> + <execution> + <id>default-instrument</id> + <goals> + <goal>instrument</goal> + </goals> + <configuration> + <skip>${skipCoverage}</skip> + </configuration> + </execution> + <execution> + <id>default-restore-instrumented-classes</id> + <goals> + <goal>restore-instrumented-classes</goal> + </goals> + <configuration> + <skip>${skipCoverage}</skip> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -275,23 +279,23 @@ </resources> </configuration> </execution> - <execution> - <id>copy-src</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/classes</outputDirectory> - <overwrite>false</overwrite> - <skip>${skipTests}</skip> - <resources> - <resource> - <directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> - </resource> - </resources> - </configuration> - </execution> +<!-- <execution> --> +<!-- <id>copy-src</id> --> +<!-- <phase>generate-resources</phase> --> +<!-- <goals> --> +<!-- <goal>copy-resources</goal> --> +<!-- </goals> --> +<!-- <configuration> --> +<!-- <outputDirectory>${basedir}/target/classes</outputDirectory> --> +<!-- <overwrite>false</overwrite> --> +<!-- <skip>${skipTests}</skip> --> +<!-- <resources> --> +<!-- <resource> --> +<!-- <directory>${basedir}/../ecomp-portal-BE-common/target/classes</directory> --> +<!-- </resource> --> +<!-- </resources> --> +<!-- </configuration> --> +<!-- </execution> --> </executions> </plugin> </plugins> @@ -482,13 +486,14 @@ <artifactId>classmate</artifactId> <version>1.3.1</version> </dependency> - + + <!-- Use Mariadb connector/j for failover --> <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <version>5.1.22</version> + <groupId>org.mariadb.jdbc</groupId> + <artifactId>mariadb-java-client</artifactId> + <version>1.5.8</version> </dependency> - + <!-- Elastic Search --> <dependency> <groupId>org.elasticsearch</groupId> @@ -727,10 +732,19 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.onap.portal</groupId> - <artifactId>ecomp-portal-BE-common-test</artifactId> - <version>${portal.version}</version> - <scope>test</scope> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-mockito</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <version>1.6.1</version> </dependency> <dependency> <groupId>org.mockito</groupId> |