From 9958409f178b6dc29080c966c7533f44ea6e4adf Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Sat, 25 Jul 2026 00:25:48 +0200
Subject: [PATCH] [Build] Leverage fix env variable matching in
 maven-toolchains-plugin

---
 Jenkinsfile | 9 +--------
 pom.xml     | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cc3cc2a4c1e..ac74d2c597d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,15 +66,8 @@ pipeline {
       steps {
         xvnc(useXauthority: true) {
           sh """
-            jdkEnvVar='JAVA_${javaVersion()}_HOME'
-            if [ "${JAVA_HOME}" = "\${JAVA_${javaVersion()}_HOME}" ]; then
-              # Workaround for https://github.com/apache/maven-toolchains-plugin/pull/148
-              # clear the structured variable and require JAVA_HOME instead
-              export JAVA_${javaVersion()}_HOME=''
-              jdkEnvVar='JAVA_HOME'
-            fi
             ./full-build.sh --tp=${params.TARGET_PLATFORM} \
-              -Pstrict-jdk-${javaVersion()} -Dtoolchain.jdk.env=\${jdkEnvVar}
+              -Pstrict-jdk-${javaVersion()} -Dtoolchain.jdk.env=JAVA_${javaVersion()}_HOME
           """
         }
       }// END steps
diff --git a/pom.xml b/pom.xml
index ea92486704a..d51ee09459c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -461,7 +461,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-toolchains-plugin</artifactId>
-					<version>3.2.0</version>
+					<version>3.3.0</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>