Merge branch 'xwiki:master' into XWIKI-21782

.github/renovate.json5

@@ -40,6 +40,26 @@
     {
       "matchPackagePrefixes": ["org.xwiki.commons:", "org.xwiki.rendering:", "org.xwiki.platform:", "org.xwiki.enterprise:"],
       "enabled": false
+    },
+
+    // Automatically assign npm packages to @manuelleduc
+    {
+      "matchDatasources": ["npm"],
+      "assignees": ["manuelleduc"]
+    },
+
+    // Automatically assign webjars packages to @mflorea
+    {
+      "matchDatasources": ["maven"],
+      "matchPackageNames": ["org.webjars*"],
+      "assignees": ["mflorea"]
+    },
+
+    // Automatically assign other Maven dependencies to @tmortagne
+    {
+      "matchDatasources": ["maven"],
+      "matchPackageNames": ["!org.webjars*"],
+      "assignees": ["tmortagne"]
     }
   ]
 }

.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.6</version>
+    <version>1.22.2</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
       }

README.md

@@ -24,9 +24,26 @@ Read our [Release Notes](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/).
 * [Development Flow](https://dev.xwiki.org/xwiki/bin/view/Community/DevelopmentPractices#HGeneralDevelopmentFlow) to see the full list of tools we use to build the XWiki software.
 * [![Revved up by Develocity](https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A)](https://ge.xwiki.org/scans)
 
+## Project Statistics
+
+![XWiki Platform Activity](https://repobeats.axiom.co/api/embed/7d0980aec51d3e1b8622875db877a3eaacabe169.svg "XWiki Platform Activity")
+
+Note that we're [using an issue tracker](https://jira.xwiki.org/browse/XWIKI) other than GitHub Issues (hence the empty left column in the stats).
+
+See the [Project Health page](https://dev.xwiki.org/xwiki/bin/view/Community/ProjectHealth) for more statistics about the XWiki project.
+
 ## Community
+
 We're always looking for contributors!
+
 You should read our [Get Involved Guide](https://dev.xwiki.org/xwiki/bin/view/Community/Contributing) or get in touch:
-* [Blog](https://www.xwiki.org/xwiki/bin/view/Blog/)
 * [Forum](https://dev.xwiki.org/xwiki/bin/view/Community/Discuss)
 * [Chat](https://dev.xwiki.org/xwiki/bin/view/Community/Chat)
+
+You can follow the XWiki news in [our blog](https://www.xwiki.org/xwiki/bin/view/Blog/).
+
+Thank you to all contributors:
+
+<a href="https://github.com/xwiki/xwiki-platform/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=xwiki/xwiki-platform&max=5000" />
+</a>