From a2f6da0b61c65a68ecdc66ed66419c31b7fedfb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A1chym=20Metli=C4=8Dka?= <metlicka@2n.com>
Date: Tue, 28 Apr 2026 18:07:06 +0200
Subject: [PATCH] pass JAVA_HOME from Maven to Gradle correctly this time to
 ensure consistent JDK usage

---
 modules/openapi-generator-gradle-plugin/pom.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 62ab35e7f9da..402c4059849c 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -91,6 +91,10 @@
 
                 <configuration>
                     <gradleVersion>${gradleVersion}</gradleVersion>
+                    <!-- Force the Gradle daemon to use the same JVM Maven is running with.
+                         This prevents Gradle from picking up a system-level JDK (e.g. JDK 25)
+                         when Maven is configured to run on a different JDK (e.g. JDK 21). -->
+                    <javaHome>${java.home}</javaHome>
                     <args>
                         <arg>-P openApiGeneratorVersion=${project.version}</arg>
                         <!--
@@ -99,12 +103,6 @@
                         <arg>-Psigning.secretKeyRingFile=${env.TRAVIS_BUILD_DIR}/sec.gpg</arg>
                         -->
                     </args>
-                    <!-- Force the Gradle daemon to use the same JVM Maven is running with.
-                         This prevents Gradle from picking up a system-level JDK (e.g. JDK 25)
-                         when Maven is configured to run on a different JDK (e.g. JDK 21). -->
-                    <jvmArgs>
-                        <jvmArg>-Dorg.gradle.java.home=${java.home}</jvmArg>
-                    </jvmArgs>
                 </configuration>
                 <executions>
                     <execution>