SCANMAVEN-230 Update scanner library to support new bootstrapper and …

…run 'its' in parallel (#244) Co-authored-by: Leonardo Pilastri <[email protected]>
SonarSource · Oct 23, 2024 · 9250838 · 9250838
1 parent c955769
commit 9250838
Show file tree

Hide file tree

Showing 48 changed files with 729 additions and 715 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -49,6 +49,7 @@ build_task:
     folder: ${CIRRUS_WORKING_DIR}/.m2/repository
   script:
     - source cirrus-env BUILD
+    - mvn -f property-dump-plugin/pom.xml -B install
     - regular_mvn_build_deploy_analyze
   cleanup_before_cache_script:
     - cleanup_maven_repository
@@ -72,7 +73,7 @@ mend_scan_task:
   mend_script:
     - source cirrus-env QA
     - source set_maven_build_version $BUILD_NUMBER
-    - mvn clean install -DskipTests
+    - mvn clean install -DskipTests -B
     - source ws_scan.sh
   cleanup_before_cache_script: cleanup_maven_repository
   allow_failures: "true"
@@ -86,7 +87,7 @@ qa_task:
   <<: *ONLY_SONARSOURCE_QA
   eks_container:
     <<: *CONTAINER_DEFINITION
-    cpu: 2
+    cpu: 6
     memory: 4G
   env:
     matrix:

diff --git a/cirrus/cirrus-qa.sh b/cirrus/cirrus-qa.sh
@@ -10,6 +10,9 @@ mkdir -p $MAVEN_HOME_IT
 curl -sSL https://repo1.maven.org/maven2/org/apache/maven/apache-maven/$MAVEN_VERSION/apache-maven-$MAVEN_VERSION-bin.tar.gz | tar zx --strip-components 1 -C $MAVEN_HOME_IT
 cp -f ~/.m2/settings.xml $MAVEN_HOME_IT/conf/
 
+# We need to build this small plugin first, that will dump the analysis properties in a local file
+mvn -f property-dump-plugin/pom.xml --batch-mode -Dmaven.home=$MAVEN_HOME_IT install
+
 # Run ITs.
 cd its
 mvn -B -e -Dsonar.runtimeVersion=$SQ_VERSION -Dmaven.test.redirectTestOutputToFile=false -Dmaven.home=$MAVEN_HOME_IT verify
diff --git a/its/pom.xml b/its/pom.xml
@@ -38,12 +38,6 @@
       <version>2.5.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
@@ -87,13 +81,25 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <pluginManagement>
       <plugins>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
+          <version>3.5.1</version>
+          <configuration>
+            <properties>
+              <configurationParameters>
+                junit.jupiter.execution.parallel.enabled = true
+                junit.jupiter.execution.parallel.mode.default = same_thread
+                junit.jupiter.execution.parallel.mode.classes.default = concurrent
+                junit.jupiter.testclass.order.default=org.junit.jupiter.api.ClassOrderer$ClassName
+                junit.jupiter.testmethod.order.default=org.junit.jupiter.api.MethodOrderer$MethodName
+              </configurationParameters>
+            </properties>
+          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>

diff --git a/its/projects/maven/aggregator-inherit-parent-and-bind-to-verify/pom.xml b/its/projects/maven/aggregator-inherit-parent-and-bind-to-verify/pom.xml
@@ -7,7 +7,7 @@
     <version>1.0-SNAPSHOT</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
-  <artifactId>aggregator</artifactId>
+  <artifactId>aggregator-inherit-parent</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

diff --git a/its/projects/maven/bootstrap-small-project/pom.xml b/its/projects/maven/bootstrap-small-project/pom.xml
@@ -0,0 +1,13 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.sonarsource.maven.its</groupId>
+  <artifactId>bootstrap-small-project</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <properties>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
+</project>
diff --git a/its/projects/project-default-config/pom.xml b/its/projects/project-default-config/pom.xml
@@ -21,8 +21,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.3</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

diff --git a/its/projects/version/compilerPluginConfig/pom.xml b/its/projects/version/compilerPluginConfig/pom.xml
@@ -23,7 +23,7 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.3</version>
         <configuration>
-          <source>1.7</source>
+          <source>1.8</source>
           <target>1.8</target>
         </configuration>
       </plugin>

diff --git a/its/projects/version/properties/pom.xml b/its/projects/version/properties/pom.xml
@@ -6,7 +6,7 @@
   <name>Sonar :: Integration Tests :: Java Version</name>
 
   <properties>
-    <maven.compiler.source>1.7</maven.compiler.source>
+    <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
   </properties>