summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-01-14 14:24:20 -0500
committerPamela Dragosh <pdragosh@research.att.com>2020-01-14 14:24:25 -0500
commit0dde9f007be609db391715b15f3dd6c855e2c3d8 (patch)
treedbceeb69be79aa2acc4d299e7a2da75937e73555
parentb321d781b99a869e179b8003260f92969a81b43e (diff)
Update sonar config
Skip module that doesn't have code. parent now defines the plugins, no need to duplicate that. Issue-ID: POLICY-2321 Change-Id: I84a161781cc0b44ba8d328ff5fb269855fcc4b36 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rw-r--r--models-examples/pom.xml5
-rw-r--r--pom.xml71
2 files changed, 5 insertions, 71 deletions
diff --git a/models-examples/pom.xml b/models-examples/pom.xml
index e9d31b1ee..d250e5d8d 100644
--- a/models-examples/pom.xml
+++ b/models-examples/pom.xml
@@ -31,4 +31,9 @@
<name>${project.artifactId}</name>
<description>Various examples of policy type and policy models in various formats</description>
+
+ <properties>
+ <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. -->
+ <sonar.skip>true</sonar.skip>
+ </properties>
</project>
diff --git a/pom.xml b/pom.xml
index dfe5613a6..7aa780f07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,13 +41,6 @@
<properties>
<derby.version>10.13.1.1</derby.version>
<javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
-
- <!-- sonar/jacoco overrides -->
- <!-- Overriding oparent default sonar/jacoco settings Combine all our reports into one file shared across sub-modules -->
- <sonar.jacoco.reportPath>${project.basedir}/../target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-
<policy.common.version>1.6.2-SNAPSHOT</policy.common.version>
</properties>
@@ -218,32 +211,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>pre-unit-test</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- <append>true</append>
- </configuration>
- </execution>
- <execution>
- <id>post-unit-test</id>
- <phase>test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<executions>
<execution>
@@ -282,44 +249,6 @@
<pluginManagement>
<plugins>
<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>
- </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>
- <destFile>${sonar.jacoco.reportPath}</destFile>
- </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>
- <dataFile>${sonar.jacoco.reportPath}</dataFile>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>