[releng] Enable sonar and jacoco coverage on tests (#13)

Change-Id: I5441463316aed5918b632d57c8f903b68dbf924a Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
eclipse-capella · Nov 23, 2020 · d29b6ff · d29b6ff
1 parent 4e4d7fc
commit d29b6ff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 32 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -108,7 +108,15 @@ pipeline {
 		        			['org.polarsys.capella.vp.requirements.ju.testsuites.RequirementsTestSuite'])		        			 
 	        		}
 
-	        		junit '*.xml'
+	        		tester.publishTests()
+				}
+			}
+		}
+
+		stage('Sonar') {
+			steps {
+				script {
+					sonar.runSonar("eclipse_capella-requirements-vp", "eclipse/capella-requirements-vp", 'sonarcloud-token-requirements-vp')
 				}
 			}
 		}

diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,6 @@
     <tycho-version>1.3.0</tycho-version>
     <tycho-extras-version>1.3.0</tycho-extras-version>
 	<antrun-version>1.7</antrun-version>
-	<sonar-version>3.0.2</sonar-version>
-	<jacoco-version>0.7.6.201602180812</jacoco-version>
 
     <!-- for tycho -->
     <tycho.scmUrl>scm:git:http://git.polarsys.org/c/capella/capella-requirements-vp.git</tycho.scmUrl>
@@ -45,14 +43,6 @@
     <tests.ignoreFailures>true</tests.ignoreFailures>
     <os-jvm-flags />
 
-    <!-- for sonar -->
-    <sonar.skipDesign>true</sonar.skipDesign>
-    <sonar.dynamic>reuseReports</sonar.dynamic>
-    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-    <sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
-    <sonar.jacoco.reportPath>${project.basedir}/../../target/jacoco.exec</sonar.jacoco.reportPath>
-    <sonar.jacoco.itReportPath>${project.basedir}/../../target/jacoco-it.exec</sonar.jacoco.itReportPath>
-    <sonar.java.source>8</sonar.java.source>
   </properties>
 
   <modules>
@@ -143,21 +133,6 @@
           </environments>
         </configuration>
       </plugin>
-		<plugin>
-			<groupId>org.jacoco</groupId>
-			<artifactId>jacoco-maven-plugin</artifactId>
-			<version>${jacoco-version}</version>
-			<configuration>
-				<destFile>${sonar.jacoco.reportPath}</destFile>
-			</configuration>
-			<executions>
-				<execution>
-					<goals>
-						<goal>prepare-agent</goal>
-					</goals>
-				</execution>
-			</executions>
-		</plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
@@ -328,12 +303,6 @@
 					</executions>
 				</plugin>
 
-		      <plugin>
-		        <groupId>org.sonarsource.scanner.maven</groupId>
-		        <artifactId>sonar-maven-plugin</artifactId>
-		        <version>${sonar-version}</version>
-		      </plugin>
-
 			</plugins>
     </pluginManagement>
   </build>