diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2020-01-20 07:55:10 -0500 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2020-01-20 10:07:32 -0500 |
| commit | 40483cec64275e908c498309503cb17fbbd81c7a (patch) | |
| tree | 766b5b77b10ca880add6a3bea78cb2398e957d6c | |
| parent | c8856ab39a6d8376e6ad700b6acabdc7736c714f (diff) | |
First update sonar
This is still pointing to old oparent, so only making the
minor change. Note, I could not test this locally because
the JUnits fail.
Once Ali's review is merged I will make the final cleanup.
Issue-ID: POLICY-2321
Change-Id: Idcd7633fc2fdbeaede8b24aab5dcd5437632da2f
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
| -rw-r--r-- | packages/pom.xml | 8 | ||||
| -rw-r--r-- | pom.xml | 74 |
2 files changed, 9 insertions, 73 deletions
diff --git a/packages/pom.xml b/packages/pom.xml index f151c90e5..e5bc814cf 100644 --- a/packages/pom.xml +++ b/packages/pom.xml @@ -2,7 +2,7 @@ ============LICENSE_START======================================================= ONAP Policy Engine ================================================================================ - Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018, 2020 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 Bell Canada. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,6 +31,12 @@ <packaging>pom</packaging> <name>Policy Packages</name> <description>D2 ONAP Policy Installation Packages</description> + + <properties> + <!-- There is no code in this sub-module, only holds interfaces. So skip sonar. --> + <sonar.skip>true</sonar.skip> + </properties> + <profiles> <!-- DO NOT CHANGE THE *ORDER* IN WHICH THESE PROFILES ARE DEFINED! --> <profile> @@ -46,12 +46,8 @@ <snapshots.path>content/repositories/snapshots/</snapshots.path> <staging.path>content/repositories/staging/</staging.path> - <!-- 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> + <!-- Default Sonar configuration --> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> <!-- Project common dependency versions --> <springframework.version>4.3.24.RELEASE</springframework.version> @@ -175,32 +171,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> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> @@ -269,46 +239,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> |