From 6d7a8072be1fbd6a47fa327f80cdf9b8474393e2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 20 Aug 2026 13:50:25 +0000
Subject: [PATCH 1/4] Update SonarSource/sonar-java monorepo to v8.40.0.46617
---
its/plugin/plugins/java-extension-plugin/pom.xml | 2 +-
its/plugin/plugins/pom.xml | 2 +-
its/plugin/pom.xml | 2 +-
its/plugin/tests/pom.xml | 2 +-
its/ruling/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/its/plugin/plugins/java-extension-plugin/pom.xml b/its/plugin/plugins/java-extension-plugin/pom.xml
index 3e83175f64b..203f12aad7b 100644
--- a/its/plugin/plugins/java-extension-plugin/pom.xml
+++ b/its/plugin/plugins/java-extension-plugin/pom.xml
@@ -4,7 +4,7 @@
org.sonarsource.java
it-java-plugin-plugins
- 8.40.0-SNAPSHOT
+ 8.40.0.46617
java-extension-plugin
diff --git a/its/plugin/plugins/pom.xml b/its/plugin/plugins/pom.xml
index 4920251c4e0..9dd1f45799c 100644
--- a/its/plugin/plugins/pom.xml
+++ b/its/plugin/plugins/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
it-java-plugin
- 8.40.0-SNAPSHOT
+ 8.40.0.46617
it-java-plugin-plugins
diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml
index 35eb6c98278..c226ee4471b 100644
--- a/its/plugin/pom.xml
+++ b/its/plugin/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java-its
- 8.40.0-SNAPSHOT
+ 8.40.0.46617
it-java-plugin
diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml
index 9e3a150f171..ce5ba32fb22 100644
--- a/its/plugin/tests/pom.xml
+++ b/its/plugin/tests/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
it-java-plugin
- 8.40.0-SNAPSHOT
+ 8.40.0.46617
it-java-plugin-tests
diff --git a/its/ruling/pom.xml b/its/ruling/pom.xml
index 58a081b2fde..f80861c382a 100644
--- a/its/ruling/pom.xml
+++ b/its/ruling/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java-its
- 8.40.0-SNAPSHOT
+ 8.40.0.46617
it-java-ruling
From 777ae20535be148565e2f35fa002d7a12e79554a Mon Sep 17 00:00:00 2001
From: Victor Diez
Date: Fri, 21 Aug 2026 12:08:16 +0200
Subject: [PATCH 2/4] SONARJAVA-6739 Ignore intra-repository Maven parents in
Renovate
---
.github/renovate.json | 14 ++++++++++++++
its/plugin/plugins/java-extension-plugin/pom.xml | 2 +-
its/plugin/plugins/pom.xml | 2 +-
its/plugin/pom.xml | 2 +-
its/plugin/tests/pom.xml | 2 +-
its/ruling/pom.xml | 2 +-
6 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/.github/renovate.json b/.github/renovate.json
index 9bbee03daf9..e696f6d8680 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -11,6 +11,20 @@
"java-surefire/src/test/resources/**"
],
"packageRules": [
+ {
+ "description": "Do not update intra-repository Maven parent POMs to released versions",
+ "matchManagers": [
+ "maven"
+ ],
+ "matchDepTypes": [
+ "parent",
+ "parent-root"
+ ],
+ "matchPackageNames": [
+ "org.sonarsource.java:*"
+ ],
+ "enabled": false
+ },
{
"description": "External projects used as stable Java analyzer test corpora",
"matchManagers": [
diff --git a/its/plugin/plugins/java-extension-plugin/pom.xml b/its/plugin/plugins/java-extension-plugin/pom.xml
index 203f12aad7b..3e83175f64b 100644
--- a/its/plugin/plugins/java-extension-plugin/pom.xml
+++ b/its/plugin/plugins/java-extension-plugin/pom.xml
@@ -4,7 +4,7 @@
org.sonarsource.java
it-java-plugin-plugins
- 8.40.0.46617
+ 8.40.0-SNAPSHOT
java-extension-plugin
diff --git a/its/plugin/plugins/pom.xml b/its/plugin/plugins/pom.xml
index 9dd1f45799c..4920251c4e0 100644
--- a/its/plugin/plugins/pom.xml
+++ b/its/plugin/plugins/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
it-java-plugin
- 8.40.0.46617
+ 8.40.0-SNAPSHOT
it-java-plugin-plugins
diff --git a/its/plugin/pom.xml b/its/plugin/pom.xml
index c226ee4471b..35eb6c98278 100644
--- a/its/plugin/pom.xml
+++ b/its/plugin/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java-its
- 8.40.0.46617
+ 8.40.0-SNAPSHOT
it-java-plugin
diff --git a/its/plugin/tests/pom.xml b/its/plugin/tests/pom.xml
index ce5ba32fb22..9e3a150f171 100644
--- a/its/plugin/tests/pom.xml
+++ b/its/plugin/tests/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
it-java-plugin
- 8.40.0.46617
+ 8.40.0-SNAPSHOT
it-java-plugin-tests
diff --git a/its/ruling/pom.xml b/its/ruling/pom.xml
index f80861c382a..58a081b2fde 100644
--- a/its/ruling/pom.xml
+++ b/its/ruling/pom.xml
@@ -5,7 +5,7 @@
org.sonarsource.java
java-its
- 8.40.0.46617
+ 8.40.0-SNAPSHOT
it-java-ruling
From 70bdb9766c84ddad4d16fe3b92fa9fe18ac54c5b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Aug 2026 12:45:49 +0200
Subject: [PATCH 3/4] Update ruling results for PR #5905 (#5977)
Co-authored-by: github-actions[bot]
---
its/ruling/src/test/resources/mall/java-S2160.json | 5 +++++
its/ruling/src/test/resources/mall/java-S6212.json | 1 +
2 files changed, 6 insertions(+)
create mode 100644 its/ruling/src/test/resources/mall/java-S2160.json
diff --git a/its/ruling/src/test/resources/mall/java-S2160.json b/its/ruling/src/test/resources/mall/java-S2160.json
new file mode 100644
index 00000000000..b8807da7619
--- /dev/null
+++ b/its/ruling/src/test/resources/mall/java-S2160.json
@@ -0,0 +1,5 @@
+{
+"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/dto/PmsProductResult.java": [
+11
+]
+}
diff --git a/its/ruling/src/test/resources/mall/java-S6212.json b/its/ruling/src/test/resources/mall/java-S6212.json
index c6d156b68d3..5f0a1d58d7a 100644
--- a/its/ruling/src/test/resources/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/mall/java-S6212.json
@@ -10,6 +10,7 @@
65,
69,
76,
+91,
107
],
"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/controller/OssController.java": [
From e7455b10a0299783962190c70d6bd3f2c4d11f86 Mon Sep 17 00:00:00 2001
From: Victor Diez
Date: Fri, 21 Aug 2026 13:33:24 +0200
Subject: [PATCH 4/4] SONARJAVA-6739 Stabilize Mall ruling batch size
---
.../src/test/java/org/sonar/java/it/JavaRulingTest.java | 3 ++-
its/ruling/src/test/resources/mall/java-S2160.json | 5 -----
its/ruling/src/test/resources/mall/java-S6212.json | 1 -
3 files changed, 2 insertions(+), 7 deletions(-)
delete mode 100644 its/ruling/src/test/resources/mall/java-S2160.json
diff --git a/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java b/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
index 75c29bebeda..aed5d6b0cd1 100644
--- a/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
+++ b/its/ruling/src/test/java/org/sonar/java/it/JavaRulingTest.java
@@ -196,7 +196,8 @@ public void spring_mall() throws Exception {
.setProperty("docker.skip", "true")
.setProperty("java.version", "21")
.setProperty("maven-bundle-plugin.version", "5.1.4")
- .setProperty("maven.javadoc.skip", "true");
+ .setProperty("maven.javadoc.skip", "true")
+ .setProperty("sonar.java.experimental.batchModeSizeInKB", "420");
executeBuildWithCommonProperties(build, projectName);
}
diff --git a/its/ruling/src/test/resources/mall/java-S2160.json b/its/ruling/src/test/resources/mall/java-S2160.json
deleted file mode 100644
index b8807da7619..00000000000
--- a/its/ruling/src/test/resources/mall/java-S2160.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/dto/PmsProductResult.java": [
-11
-]
-}
diff --git a/its/ruling/src/test/resources/mall/java-S6212.json b/its/ruling/src/test/resources/mall/java-S6212.json
index 5f0a1d58d7a..c6d156b68d3 100644
--- a/its/ruling/src/test/resources/mall/java-S6212.json
+++ b/its/ruling/src/test/resources/mall/java-S6212.json
@@ -10,7 +10,6 @@
65,
69,
76,
-91,
107
],
"com.macro.mall:mall:mall-admin/src/main/java/com/macro/mall/controller/OssController.java": [