Merge pull request #257 from bsinno/feature_sonar_pom_hygiene
sonar pom hygiene
This commit is contained in:
39
pom.xml
39
pom.xml
@@ -100,7 +100,6 @@
|
|||||||
<org.powermock.version>1.5.4</org.powermock.version>
|
<org.powermock.version>1.5.4</org.powermock.version>
|
||||||
<pl.pragmatists.version>1.0.2</pl.pragmatists.version>
|
<pl.pragmatists.version>1.0.2</pl.pragmatists.version>
|
||||||
<json-path.version>0.9.1</json-path.version>
|
<json-path.version>0.9.1</json-path.version>
|
||||||
<aspectj.version>1.8.5</aspectj.version>
|
|
||||||
<guava.version>19.0</guava.version>
|
<guava.version>19.0</guava.version>
|
||||||
<mariadb-java-client.version>1.4.3</mariadb-java-client.version>
|
<mariadb-java-client.version>1.4.3</mariadb-java-client.version>
|
||||||
<embedded-mongo.version>1.50.2</embedded-mongo.version>
|
<embedded-mongo.version>1.50.2</embedded-mongo.version>
|
||||||
@@ -124,33 +123,13 @@
|
|||||||
<!-- Sonar - START-->
|
<!-- Sonar - START-->
|
||||||
<sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
|
<sonar.host.url>https://sonar.eu-gb.mybluemix.net</sonar.host.url>
|
||||||
<sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
|
<sonar.github.repository>eclipse/hawkbit</sonar.github.repository>
|
||||||
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
|
|
||||||
<sonar.links.homepage>https://projects.eclipse.org/projects/iot.hawkbit</sonar.links.homepage>
|
<sonar.links.homepage>https://projects.eclipse.org/projects/iot.hawkbit</sonar.links.homepage>
|
||||||
<sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
|
<sonar.links.ci>https://circleci.com/gh/eclipse/hawkbit</sonar.links.ci>
|
||||||
<!-- Jacoco version to use -->
|
|
||||||
<jacoco.version>0.7.7.201606060606</jacoco.version>
|
<jacoco.version>0.7.7.201606060606</jacoco.version>
|
||||||
<!-- The Sonar Jacoco Listener for JUnit to extract coverage details
|
|
||||||
per test -->
|
|
||||||
<sonar-jacoco-listeners.version>1.4</sonar-jacoco-listeners.version>
|
|
||||||
<!-- Don't let Sonar execute tests. We will ask it to Maven -->
|
|
||||||
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
|
|
||||||
<!-- The system property jacoco.outputDir needs to be override on the
|
|
||||||
command line with an absolute path if you want to merge results from all
|
|
||||||
modules. Example in a Jenkisn build where ${WORKSPACE} is defined and your
|
|
||||||
project in the root directory of the workspace : mvn clean install -Prun-its,coverage
|
|
||||||
-Djacoco.outputDir=${WORKSPACE}/target Note that unfortunately using the
|
|
||||||
following does not work because of http://jira.codehaus.org/browse/SONAR-3427:
|
|
||||||
<jacoco.outputDir>${session.executionRootDirectory}/target/</jacoco.outputDir> -->
|
|
||||||
<jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
|
<jacoco.outputDir>${project.basedir}/../target/</jacoco.outputDir>
|
||||||
<!-- Jacoco output file for UTs -->
|
|
||||||
<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
|
<jacoco.out.ut.file>jacoco-ut.exec</jacoco.out.ut.file>
|
||||||
<!-- Tells Sonar where the Jacoco coverage result file is located for
|
|
||||||
Unit Tests -->
|
|
||||||
<sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
|
<sonar.jacoco.reportPath>${jacoco.outputDir}/${jacoco.out.ut.file}</sonar.jacoco.reportPath>
|
||||||
<!-- Jacoco output file for ITs -->
|
|
||||||
<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
|
<jacoco.out.it.file>jacoco-it.exec</jacoco.out.it.file>
|
||||||
<!-- Tells Sonar where the Jacoco coverage result file is located for
|
|
||||||
Integration Tests -->
|
|
||||||
<sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
|
<sonar.jacoco.itReportPath>${jacoco.outputDir}/${jacoco.out.it.file}</sonar.jacoco.itReportPath>
|
||||||
<!-- Sonar - END-->
|
<!-- Sonar - END-->
|
||||||
</properties>
|
</properties>
|
||||||
@@ -295,7 +274,6 @@
|
|||||||
<forkCount>1</forkCount>
|
<forkCount>1</forkCount>
|
||||||
<argLine>
|
<argLine>
|
||||||
${jacoco.agent.ut.arg}
|
${jacoco.agent.ut.arg}
|
||||||
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
|
|
||||||
</argLine>
|
</argLine>
|
||||||
<properties>
|
<properties>
|
||||||
<property>
|
<property>
|
||||||
@@ -312,13 +290,6 @@
|
|||||||
<exclude>**/Abstract*.java</exclude>
|
<exclude>**/Abstract*.java</exclude>
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.aspectj</groupId>
|
|
||||||
<artifactId>aspectjweaver</artifactId>
|
|
||||||
<version>${aspectj.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@@ -326,8 +297,7 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<reuseForks>true</reuseForks>
|
<reuseForks>true</reuseForks>
|
||||||
<forkCount>3</forkCount>
|
<forkCount>3</forkCount>
|
||||||
<argLine>-Xmx1024m ${jacoco.agent.ut.arg}
|
<argLine>-Xmx1024m ${jacoco.agent.ut.arg}</argLine>
|
||||||
-javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"</argLine>
|
|
||||||
<properties>
|
<properties>
|
||||||
<property>
|
<property>
|
||||||
<name>listener</name>
|
<name>listener</name>
|
||||||
@@ -335,13 +305,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</properties>
|
</properties>
|
||||||
</configuration>
|
</configuration>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.aspectj</groupId>
|
|
||||||
<artifactId>aspectjweaver</artifactId>
|
|
||||||
<version>${aspectj.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<id>integration-test</id>
|
<id>integration-test</id>
|
||||||
|
|||||||
Reference in New Issue
Block a user