From a5d05acfe255c6d8c525ca08a679705bd1912d51 Mon Sep 17 00:00:00 2001
From: Julien HENRY <john @ doe.org>
Date: Wed, 11 Mar 2026 11:56:45 +0100
Subject: [PATCH] Update scanner library to fix proxy authentication on CONNECT

---
 .github/workflows/build.yml             | 4 ++--
 pom.xml                                 | 2 +-
 src/main/assembly/bin/sonar-scanner     | 1 +
 src/main/assembly/bin/sonar-scanner.bat | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e082dee5..a89f95a6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           version: 2025.7.12
           tool_versions: |
-            java 21
+            java temurin-21
             maven 3.9
             node 18.17.0
       - uses: SonarSource/ci-github-actions/build-maven@v1
@@ -64,7 +64,7 @@ jobs:
         with:
           version: 2025.7.12
           tool_versions: |
-            java ${{ matrix.java_version }}
+            java temurin-${{ matrix.java_version }}
             maven 3.9
 
       - name: Vault
diff --git a/pom.xml b/pom.xml
index 0d6a418a..4c215ae8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.sonarsource.scanner.lib</groupId>
       <artifactId>sonar-scanner-java-library</artifactId>
-      <version>4.0.1.1587</version>
+      <version>4.1.0.1604</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
diff --git a/src/main/assembly/bin/sonar-scanner b/src/main/assembly/bin/sonar-scanner
index c3441312..8b5a2f58 100755
--- a/src/main/assembly/bin/sonar-scanner
+++ b/src/main/assembly/bin/sonar-scanner
@@ -65,6 +65,7 @@ project_home=`pwd`
 
 exec "$java_cmd" \
   -Djava.awt.headless=true \
+  -Djdk.http.auth.tunneling.disabledSchemes= \
   $SONAR_SCANNER_OPTS \
   $SONAR_SCANNER_DEBUG_OPTS \
   -classpath  "$jar_file" \
diff --git a/src/main/assembly/bin/sonar-scanner.bat b/src/main/assembly/bin/sonar-scanner.bat
index 654137dc..f704d684 100644
--- a/src/main/assembly/bin/sonar-scanner.bat
+++ b/src/main/assembly/bin/sonar-scanner.bat
@@ -69,7 +69,7 @@ set PROJECT_HOME=%CD%
 @REM remove trailing backslash, see https://groups.google.com/d/msg/sonarqube/wi7u-CyV_tc/3u9UKRmABQAJ
 IF %PROJECT_HOME:~-1% == \ SET PROJECT_HOME=%PROJECT_HOME:~0,-1%
 
-%JAVA_EXEC% -Djava.awt.headless=true %SONAR_SCANNER_DEBUG_OPTS% %SONAR_SCANNER_OPTS% -cp "%SONAR_SCANNER_HOME%\lib\sonar-scanner-cli-${project.version}.jar" "-Dscanner.home=%SONAR_SCANNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonarsource.scanner.cli.Main %*
+%JAVA_EXEC% -Djava.awt.headless=true "-Djdk.http.auth.tunneling.disabledSchemes=" %SONAR_SCANNER_DEBUG_OPTS% %SONAR_SCANNER_OPTS% -cp "%SONAR_SCANNER_HOME%\lib\sonar-scanner-cli-${project.version}.jar" "-Dscanner.home=%SONAR_SCANNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonarsource.scanner.cli.Main %*
 if ERRORLEVEL 1 goto error
 goto end