summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2020-02-19 20:23:15 +0000
committerKajur, Harish (vk250x) <vk250x@att.com>2020-02-19 20:23:31 +0000
commit3d57ab6bc5054448e23d0a0a6e843b3617565b56 (patch)
tree19369275a8c76136c90f964007864cfef0c73050
parente375bebda1987cfc5fc6177b84ae69b68d9777ad (diff)
Update SONAR config
Issue-ID: AAI-2793 Change-Id: Ifa440d05795e494e15009d6e8721f0f7208483c9 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
-rw-r--r--esr-mgr/dependency-reduced-pom.xml67
-rw-r--r--pom.xml164
2 files changed, 216 insertions, 15 deletions
diff --git a/esr-mgr/dependency-reduced-pom.xml b/esr-mgr/dependency-reduced-pom.xml
index 67c922b..4b45dbf 100644
--- a/esr-mgr/dependency-reduced-pom.xml
+++ b/esr-mgr/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>aai-esr-server</artifactId>
<groupId>org.onap.aai.esr-server</groupId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>esr-mgr</artifactId>
@@ -116,13 +116,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-hibernate-validations</artifactId>
- <version>1.5.6</version>
- </dependency>
- </dependencies>
<configuration>
<apiSources>
<apiSource>
@@ -174,9 +167,37 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.10.5</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>ant-launcher</artifactId>
+ <groupId>org.apache.ant</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-easymock</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>cglib-nodep</artifactId>
+ <groupId>cglib</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>powermock-api-support</artifactId>
+ <groupId>org.powermock</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.4.10</version>
+ <version>1.5.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -188,7 +209,7 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.4.10</version>
+ <version>1.5.5</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -202,14 +223,30 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.8.2</version>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-library</artifactId>
+ <version>1.3</version>
<scope>test</scope>
<exclusions>
<exclusion>
- <artifactId>ant-launcher</artifactId>
- <groupId>org.apache.ant</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>objenesis</artifactId>
+ <groupId>org.objenesis</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>cglib-nodep</artifactId>
+ <groupId>cglib</groupId>
</exclusion>
</exclusions>
</dependency>
diff --git a/pom.xml b/pom.xml
index 2a1c7c4..c6f093c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,21 @@
<junit.version>4.10</junit.version>
<jetty.version>9.4.22.v20191022</jetty.version>
<org.apache.ant.version>1.10.5</org.apache.ant.version>
+
+ <sonar.jacoco.reportPath />
+ <sonar.jacoco.itReportPath />
+ <sonar.jacoco.reportMissing.force.zero />
+
+ <jacoco.line.coverage.limit>0.75</jacoco.line.coverage.limit>
+ <jacoco.version>0.8.5</jacoco.version>
+ <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
+ <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
+ <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+ <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
+
+ <sonar.scanner.version>3.7.0.1746</sonar.scanner.version>
+
+
</properties>
<dependencyManagement>
@@ -301,5 +316,154 @@
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <!-- once we connect aai-parent or oparent 3.0+ we can take out this
+ whole section -->
+
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.version}</version>
+ <configuration>
+ <!-- Note: This exclusion list should match <sonar.exclusions> property
+ above -->
+ <excludes>
+ <exclude>**/gen/**</exclude>
+ <exclude>**/generated-sources/**</exclude>
+ <exclude>**/yang-gen/**</exclude>
+ <exclude>**/pax/**</exclude>
+ <exclude>org/onap/aai/babel/xml/generator/xsd/*</exclude>
+ </excludes>
+ </configuration>
+ <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>
+ <!-- Sets the path to the file which contains the execution data
+ . -->
+ <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+ <!-- Sets the name of the property containing the settings for JaCoCo
+ runtime agent. -->
+ <propertyName>surefireArgLine</propertyName>
+ </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>
+ <!-- Sets the path to the file which contains the execution data
+ . -->
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <!-- Sets the output directory for the code coverage report. -->
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>pre-integration-test</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data
+ . -->
+ <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+ <!-- Sets the name of the property containing the settings for JaCoCo
+ runtime agent. -->
+ <propertyName>failsafeArgLine</propertyName>
+ </configuration>
+ </execution>
+ <!-- Ensures that the code coverage report for integration tests after
+ integration tests have been run. -->
+ <execution>
+ <id>post-integration-test</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the path to the file which contains the execution data
+ . -->
+ <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+ <!-- Sets the output directory for the code coverage report. -->
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+ </configuration>
+ </execution>
+ <execution>
+ <id>default-check</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <configuration>
+ <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+ <rules>
+ <rule implementation="org.jacoco.maven.RuleConfiguration">
+ <element>BUNDLE</element>
+ <limits>
+ <limit implementation="org.jacoco.report.check.Limit">
+ <counter>LINE</counter>
+ <value>COVEREDRATIO</value>
+ <minimum>${jacoco.line.coverage.limit}</minimum>
+ </limit>
+ </limits>
+ </rule>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M4</version>
+ <configuration>
+ <!-- Sets the VM argument line used when unit tests are run. -->
+ <argLine>${surefireArgLine}</argLine>
+ <!-- Excludes integration tests when unit tests are run. -->
+ <excludes>
+ <exclude>**/IT*.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>3.0.0-M4</version>
+ <executions>
+ <!-- Ensures that both integration-test and verify goals of the Failsafe
+ Maven plugin are executed. -->
+ <execution>
+ <id>integration-tests</id>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <!-- Sets the VM argument line used when integration tests are run. -->
+ <argLine>${failsafeArgLine}</argLine>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.sonarsource.scanner.maven</groupId>
+ <artifactId>sonar-maven-plugin</artifactId>
+ <version>${sonar.scanner.version}</version>
+ </plugin>
+ <!-- end removable sonar config, note the additional exclusion for babel above
+ -->
+ </plugins>
+
</build>
</project>