Merge branch 'master' into XWIKI-22121

.github/renovate.json5

@@ -30,10 +30,10 @@
   "ignoreDeps": ["org.eclipse.m2e:lifecycle-mapping"],
 
   "packageRules": [
-    // Indicate the URL to the XWiki Nexus public proxy for non-Central Maven dependencies
+    // Add the URL to the XWiki Nexus public proxy for non-Central Maven dependencies
     {
       "matchDatasources": ["maven"],
-      "registryUrls": ["https://nexus.xwiki.org/nexus/content/repositories/public/"]
+      "registryUrls": ["https://repo1.maven.org/maven2/", "https://nexus.xwiki.org/nexus/content/repositories/public/"]
     },
 
     // There is no point trying to find updates for commons, rendering and platform dependencies

.mvn/develocity.xml

@@ -45,15 +45,15 @@
        more to save the goal outputs since they're not going to be re-used.
     -->
     <local>
-      <enabled><![CDATA[env['CI'] == null]]></enabled>
+      <enabled>#{env['CI'] == null}</enabled>
     </local>
     <remote>
       <!-- Notes:
        * To disable the remote build cache on the command line, pass: -Ddevelocity.cache.remote.enabled=false
       -->
       <enabled>true</enabled>
       <!-- Only CI jobs are allowed to store build outputs in the remote cache -->
-      <storeEnabled><![CDATA[isTrue(env['CI']) and isTrue(env['DEVELOCITY_ACCESS_KEY'])]]></storeEnabled>
+      <storeEnabled>#{env['CI'] != null}</storeEnabled>
       <server>
         <!-- Note: Remote cache authentication is handled in the .m2/.develocity/keys.properties file and not
              anymore in the Maven settings.xml file -->

.mvn/extensions.xml

@@ -25,11 +25,11 @@ xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.1.0 https://maven.apach
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>1.21.1</version>
+    <version>1.22.1</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>2.0</version>
+    <version>2.0.1</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -114,19 +114,29 @@ def builds = [
     )
   },
   'Quality' : {
-    // Run the quality checks.
-    // Sonar notes:
-    // - we need sonar:sonar to perform the analysis and push the results to Sonarcloud
-    // - we need jacoco:report to execute jacoco and compute test coverage
-    // - we need -Pcoverage and -Dxwiki.jacoco.itDestFile to tell Jacoco to compute a single global Jacoco
-    //   coverage for the full reactor (so that the coverage percentage computed takes into account module tests
-    //   which cover code in other modules)
-    build(
-      name: 'Quality',
-      goals: 'clean install jacoco:report sonar:sonar',
-      profiles: 'quality,legacy,coverage',
-      properties: '-Dxwiki.jacoco.itDestFile=`pwd`/target/jacoco-it.exec'
-    )
+    node() {
+      // Run the quality checks.
+      // Notes for step 1:
+      // - The build executes jacoco to generate a single jacoco exec file containing the results of the coverage
+      //   for all tests from all modules. This why we need -Pcoverage and -Dxwiki.jacoco.itDestFile.
+      buildInsideNode(
+        name: 'Quality Step 1',
+        goals: 'clean install',
+        profiles: 'repository-snapshots,quality,legacy,coverage',
+        properties: '-Dxwiki.jacoco.itDestFile=`pwd`/target/jacoco-it.exec'
+      )
+      // Notes for step 2:
+      // - We generate the jacoco reports for all modules (all from the single jacoco-it.exec file)
+      // - We then generate the sonar analysis and upload to Sonarcloud with the sonar:sonar goal.
+      // - Sonar uses the jacoco report files and it's thus important that the sonar:sonar goal is executed after
+      //   the jacoco:report one.
+      buildInsideNode(
+        name: 'Quality Step 2',
+        goals: 'jacoco:report sonar:sonar',
+        profiles: 'repository-snapshots,quality,legacy,coverage',
+        properties: '-Dxwiki.jacoco.itDestFile=`pwd`/target/jacoco-it.exec'
+      )
+    }
   }
 ]
 
@@ -284,6 +294,8 @@ private void buildInsideNode(map)
       // Keep builds for 30 days since we want to be able to see all builds if there are a lot at a given time, to be
       // able to identify flickers, etc.
       daysToKeepStr = '30'
+      // We don't need to trigger xwiki-platform monthly since it's already the case of xwiki-commons
+      monthlyTrigger = false
       if (map.pom != null) {
         pom = map.pom
       }