From 832dd003a24589a1d2f80e1f0e7f68db263b0c91 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 22 Oct 2026 10:27:28 +0000
Subject: [PATCH 1/3] Update SonarSource/sonar-analyzer-commons monorepo to
 v2.34.0.15495

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index db627a46053..6a3002bbd56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
     <sonar.scanner.version>13.16.0.6705</sonar.scanner.version>
     <sonarlint.plugin.api.version>12.1.1.87771</sonarlint.plugin.api.version>
     <sonar.sca.exclusions>its/**,java-checks-test-sources/**</sonar.sca.exclusions>
-    <analyzer.commons.version>2.33.0.5369</analyzer.commons.version>
+    <analyzer.commons.version>2.34.0.15495</analyzer.commons.version>
     <orchestrator.version>6.4.4.4797</orchestrator.version>
     <sonar.integration.tester.version>1.5.0.1412</sonar.integration.tester.version>
     <sslr.version>1.26.0.4194</sslr.version>

From 1f8262732859f123d1f84013fe64dccc9714d7ef Mon Sep 17 00:00:00 2001
From: Victor Diez <victor.diez@sonarsource.com>
Date: Thu, 22 Oct 2026 12:51:40 +0200
Subject: [PATCH 2/3] Normalize BSD 2-Clause license independently of
 dependency versions

---
 override-dep-licenses.properties | 1 -
 pom.xml                          | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/override-dep-licenses.properties b/override-dep-licenses.properties
index 9dab5494438..f9d5c686c6b 100644
--- a/override-dep-licenses.properties
+++ b/override-dep-licenses.properties
@@ -6,4 +6,3 @@ org.ow2.asm--asm-analysis--8.0.1=bsd
 org.ow2.asm--asm-commons--8.0.1=bsd
 org.ow2.asm--asm-tree--8.0.1=bsd
 org.ow2.asm--asm-util--8.0.1=bsd
-org.codehaus.woodstox--stax2-api--4.3.0=bsd
diff --git a/pom.xml b/pom.xml
index 6a3002bbd56..095abd54058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -351,6 +351,15 @@
   <build>
     <pluginManagement>
       <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>license-maven-plugin</artifactId>
+          <configuration>
+            <licenseMerges combine.children="append">
+              <licenseMerge>bsd|The BSD 2-Clause License</licenseMerge>
+            </licenseMerges>
+          </configuration>
+        </plugin>
         <plugin>
           <groupId>de.thetaphi</groupId>
           <artifactId>forbiddenapis</artifactId>

From 402cb42b1c62f22ed1a741be2a2810e6be340d44 Mon Sep 17 00:00:00 2001
From: Victor Diez <victor.diez@sonarsource.com>
Date: Thu, 22 Oct 2026 12:54:58 +0200
Subject: [PATCH 3/3] Remove redundant ASM license overrides

---
 .github/workflows/build.yml      | 3 +--
 override-dep-licenses.properties | 8 --------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 override-dep-licenses.properties

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b0cb6f8cb27..71956117c71 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -411,8 +411,7 @@ jobs:
           mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party \
             --batch-mode \
             "-Dlicense.missingFile=${PWD}/missing-dep-licenses.properties" \
-            -DuseMissingFile \
-            "-Dlicense.overrideUrl=file://${PWD}/override-dep-licenses.properties"
+            -DuseMissingFile
 
   qa-os-win:
     name: Build and Unit Test on Windows
diff --git a/override-dep-licenses.properties b/override-dep-licenses.properties
deleted file mode 100644
index f9d5c686c6b..00000000000
--- a/override-dep-licenses.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Override license defined in parent POM
-# See check-license-compatibility.sh
-
-org.ow2.asm--asm--8.0.1=bsd
-org.ow2.asm--asm-analysis--8.0.1=bsd
-org.ow2.asm--asm-commons--8.0.1=bsd
-org.ow2.asm--asm-tree--8.0.1=bsd
-org.ow2.asm--asm-util--8.0.1=bsd