Skip to content

Commit e4e1900

Browse files
authored
pass JAVA_HOME from Maven to Gradle correctly this time to ensure consistent JDK usage (#23646)
1 parent 0bfeb68 commit e4e1900

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

  • modules/openapi-generator-gradle-plugin

modules/openapi-generator-gradle-plugin/pom.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191

9292
<configuration>
9393
<gradleVersion>${gradleVersion}</gradleVersion>
94+
<!-- Force the Gradle daemon to use the same JVM Maven is running with.
95+
This prevents Gradle from picking up a system-level JDK (e.g. JDK 25)
96+
when Maven is configured to run on a different JDK (e.g. JDK 21). -->
97+
<javaHome>${java.home}</javaHome>
9498
<args>
9599
<arg>-P openApiGeneratorVersion=${project.version}</arg>
96100
<!--
@@ -99,12 +103,6 @@
99103
<arg>-Psigning.secretKeyRingFile=${env.TRAVIS_BUILD_DIR}/sec.gpg</arg>
100104
-->
101105
</args>
102-
<!-- Force the Gradle daemon to use the same JVM Maven is running with.
103-
This prevents Gradle from picking up a system-level JDK (e.g. JDK 25)
104-
when Maven is configured to run on a different JDK (e.g. JDK 21). -->
105-
<jvmArgs>
106-
<jvmArg>-Dorg.gradle.java.home=${java.home}</jvmArg>
107-
</jvmArgs>
108106
</configuration>
109107
<executions>
110108
<execution>

0 commit comments

Comments
 (0)