From 2df783fe7dddfb97d457125fa43d123d74101df6 Mon Sep 17 00:00:00 2001
From: Catalin-Emanuel ENACHE <Catalin-Emanuel.ENACHE@ext.ec.europa.eu>
Date: Mon, 5 Feb 2018 16:00:30 +0100
Subject: [PATCH] [EDELIVERY-3114] downgraded sonar maven plugin + refactoring
---
pom.xml | 7 +++----
smp-parent-pom/pom.xml | 9 ++++++---
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 18b50428a..360873d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
<sonar.exclusions>**/smp/data/model/*, **/smp/exceptions/*, **/to_be_removed/*</sonar.exclusions>
<sonar.ws.timeout>300</sonar.ws.timeout>
- <!--<sonar.login>1659ebb88e2d1a896bfd56e835358c06418219c3</sonar.login>-->
+ <sonar.login>1659ebb88e2d1a896bfd56e835358c06418219c3</sonar.login>
<sonar.jacoco.remotePort>${jacocoRemotePort}</sonar.jacoco.remotePort>
<sonar.jacoco.remoteAddress>${jacocoRemoteAddress}</sonar.jacoco.remoteAddress>
<jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
@@ -128,11 +128,10 @@
<build>
<plugins>
- <!-- sonar maven plugin (for 5.6 sonarqube) -->
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
- <version>3.3.0.603</version>
+ <version>3.2</version>
</plugin>
</plugins>
</build>
diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml
index c4dfa807c..63934cd4f 100644
--- a/smp-parent-pom/pom.xml
+++ b/smp-parent-pom/pom.xml
@@ -98,7 +98,7 @@
<sonar.jacoco.itReportPath>${maven.multiModuleProjectDirectory}/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
<jacoco.maven.plugin.version>0.7.9</jacoco.maven.plugin.version>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
- <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
+ <!--<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>-->
<sonar.language>java</sonar.language>
</properties>
@@ -650,7 +650,8 @@
<execution>
<id>default-test</id>
<configuration>
- <argLine>-Duser.language=en -Xms512m -Xmx1024m ${surefire.argline} </argLine>
+ <argLine>-server -ea -Duser.language=en -Xms512m -Xmx1024m ${surefire.argline}
+ </argLine>
<includes>
<include>**/*Test.java</include>
</includes>
@@ -680,7 +681,9 @@
</goals>
<configuration>
<!-- Sets the VM argument line used when integration tests are run. -->
- <argLine>-Duser.language=en -Xms512m -Xmx1024m ${failsafe.argline}</argLine>
+ <argLine>-server -ea -Xms512m -Xmx1024m -Duser.language=en ${failsafe.argline}
+ </argLine>
+
<includes>
<include>**/*IntegrationTest.java</include>
</includes>
--
GitLab