diff options
| author |   Dominic Lunanuova <dgl@research.att.com> | 2020-03-16 15:55:00 +0000 |
|---|---|---|
| committer | Dominic Lunanuova <dgl@research.att.com> | 2020-03-16 15:55:06 +0000 |
| commit | f39e950f1d58a6e666a747a552693f7b8c1a8be7 (patch) | |
| tree | d6dc53ae6c7df879075b6cd19a6e9f704e237bdd | |
| parent | e9d7a8e6513dacdd945beea4a494586ecee24a27 (diff) | |
New Sonar settings
Issue-ID: DMAAP-1408
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Change-Id: I13b332e8e0368c4cbae3cb33f33382561548e2b2
| -rw-r--r-- | pom.xml | 42 | ||||
| -rw-r--r-- | version.properties | 2 |
2 files changed, 32 insertions, 12 deletions
@@ -28,7 +28,7 @@ <parent> <groupId>org.onap.oparent</groupId> <artifactId>oparent</artifactId> - <version>2.0.0</version> + <version>2.1.0</version> <relativePath/> </parent> <build> @@ -190,6 +190,29 @@ </configuration> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>report</id> + <goals> + <goal>report</goal> + </goals> + <configuration> + <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile> + <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> <pluginManagement> <plugins> @@ -420,21 +443,18 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <jettyVersion>9.4.24.v20191120</jettyVersion> <eelf.version>1.0.0</eelf.version> - <artifact.version>2.0.2-SNAPSHOT</artifact.version> + <artifact.version>2.0.3-SNAPSHOT</artifact.version> <junit.version>4.12</junit.version> <!-- SONAR --> - <jacoco.version>0.7.7.201606060606</jacoco.version> - <sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version> - <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin> - <!-- Default Sonar configuration --> - <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath> - <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath> - <!-- Note: This list should match jacoco-maven-plugin's exclusion list - below --> + <sonar.language>java</sonar.language> + <sonar.skip>false</sonar.skip> + <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath> + <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths> + <sonar.projectVersion>${project.version}</sonar.projectVersion> <sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions> <!-- for Distribution Management --> - <sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}</sitePath> + <sitePath>/content/sites/site/org/onap/dmaap/buscontroller/${artifact.version}/${project.version}</sitePath> <nexusproxy>https://nexus.onap.org</nexusproxy> </properties> <description>Data Movement as a Platform (DMaaP) Bus Controller provides a REST API for other DCAE infrastructure components to provision DMaaP resources. A DMaaP resource is a Data Router Feed or a Message Router Topic, and their associated publishers and subscribers.</description> diff --git a/version.properties b/version.properties index 8d3835e..b535a9b 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ major=2 minor=0 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins |