From 71f5cb1008da6e42e70412012ec95f3898776209 Mon Sep 17 00:00:00 2001
From: Marharyta <margarita.nedzelska@sonarsource.com>
Date: Tue, 14 Nov 2023 11:53:38 +0100
Subject: [PATCH] [NO JIRA] Improve caching test output (#4504)

* Disable test execution in the random order
* Remove "Build-Time" from jar Manifest (except plugin)
---
 pom.xml                   | 31 +++++++++++++++++++++++++------
 sonar-java-plugin/pom.xml |  5 +++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1bc1b6332b6..0be11a951ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,17 +287,29 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration/>
-        </plugin>
-
         <plugin>
           <groupId>de.thetaphi</groupId>
           <artifactId>forbiddenapis</artifactId>
           <version>3.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>${version.jar.plugin}</version>
+          <configuration>
+            <archive>
+              <addMavenDescriptor>false</addMavenDescriptor>
+              <manifestEntries>
+                <!--
+                  Develocity (gradle-enterprise-maven-extension) can reduce the build duration using its cache only for deterministic build.
+                  'Build-Time', defined in the parent pom, changes at each build and prevents us from benefiting from the cache.
+                  We didn't find a solution to unset 'Build-Time', so as a workaround, we provide a constant value '_'.
+                -->
+                <Build-Time>_</Build-Time>
+              </manifestEntries>
+            </archive>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -336,6 +348,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <runOrder>alphabetical</runOrder>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/sonar-java-plugin/pom.xml b/sonar-java-plugin/pom.xml
index 50275e422b4..a11afc7357f 100644
--- a/sonar-java-plugin/pom.xml
+++ b/sonar-java-plugin/pom.xml
@@ -126,6 +126,11 @@
           <sonarLintSupported>true</sonarLintSupported>
           <sonarQubeMinVersion>9.9</sonarQubeMinVersion>
           <jreMinVersion>11</jreMinVersion>
+          <archive>
+            <manifestEntries>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+          </archive>
         </configuration>
       </plugin>
       <plugin>