From fbf8ab0c1d28d075c0e1eeb278fbdd5a25ecdfdc Mon Sep 17 00:00:00 2001
From: Jachym Metlicka <krisna.visnu@gmail.com>
Date: Sun, 15 Mar 2026 01:25:48 +0100
Subject: [PATCH 1/3] feature: add profile to skip Gradle tests when Maven
 tests are skipped. Use same java version for the gradle task as for the maven

---
 .../openapi-generator-gradle-plugin/pom.xml   | 40 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 79b00d54b475..280f14113d23 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -99,9 +99,16 @@
                         <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>
+                        <id>gradle-build</id>
                         <phase>install</phase>
                         <goals>
                             <!-- goal must be "invoke" -->
@@ -109,7 +116,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                                <!-- calls "clean assemble install" -->
+                                <!-- calls "clean build publishToMavenLocal" (build includes tests) -->
                                 <task>clean</task>
                                 <task>build</task>
                                 <task>publishToMavenLocal</task>
@@ -122,6 +129,37 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>skip-gradle-tests</id>
+            <activation>
+                <property>
+                    <name>maven.test.skip</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.fortasoft</groupId>
+                        <artifactId>gradle-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Override the gradle-build execution: swap `build` (assemble + test)
+                                 for `assemble` (no tests) when -Dmaven.test.skip=true is set. -->
+                            <execution>
+                                <id>gradle-build</id>
+                                <configuration>
+                                    <tasks>
+                                        <task>clean</task>
+                                        <task>assemble</task>
+                                        <task>publishToMavenLocal</task>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>static-analysis</id>
             <build>

From 0b49c72760b88b6bdb89d46761260e81bc9eb9a6 Mon Sep 17 00:00:00 2001
From: Jachym Metlicka <krisna.visnu@gmail.com>
Date: Sun, 15 Mar 2026 14:38:43 +0100
Subject: [PATCH 2/3] feature: add profile to skip Gradle tests when Maven
 tests are skipped

---
 .../openapi-generator-gradle-plugin/pom.xml   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 280f14113d23..94649cc0b74c 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -160,6 +160,36 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>skip-gradle-tests-skipTests</id>
+            <activation>
+                <property>
+                    <name>skipTests</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.fortasoft</groupId>
+                        <artifactId>gradle-maven-plugin</artifactId>
+                        <executions>
+                            <!-- Override the gradle-build execution: swap `build` (assemble + test)
+                                 for `assemble` (no tests) when -DskipTests is set. -->
+                            <execution>
+                                <id>gradle-build</id>
+                                <configuration>
+                                    <tasks>
+                                        <task>clean</task>
+                                        <task>assemble</task>
+                                        <task>publishToMavenLocal</task>
+                                    </tasks>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>static-analysis</id>
             <build>

From 95cd659477349da2e5976657c722c491c2c53972 Mon Sep 17 00:00:00 2001
From: Jachym Metlicka <krisna.visnu@gmail.com>
Date: Sun, 15 Mar 2026 15:17:55 +0100
Subject: [PATCH 3/3] feature: update Gradle build configuration to exclude
 tests while preserving quality checks

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

diff --git a/modules/openapi-generator-gradle-plugin/pom.xml b/modules/openapi-generator-gradle-plugin/pom.xml
index 94649cc0b74c..22765b6e5f98 100644
--- a/modules/openapi-generator-gradle-plugin/pom.xml
+++ b/modules/openapi-generator-gradle-plugin/pom.xml
@@ -143,14 +143,20 @@
                         <groupId>org.fortasoft</groupId>
                         <artifactId>gradle-maven-plugin</artifactId>
                         <executions>
-                            <!-- Override the gradle-build execution: swap `build` (assemble + test)
-                                 for `assemble` (no tests) when -Dmaven.test.skip=true is set. -->
+                            <!-- Override the gradle-build execution: keep `build` (so checkstyle,
+                                 spotbugs, and other check-lifecycle tasks still run) but add
+                                 `-x test` to exclude only the Gradle test task, mirroring
+                                 Maven's maven.test.skip behaviour which does not skip quality checks. -->
                             <execution>
                                 <id>gradle-build</id>
                                 <configuration>
+                                    <args combine.children="append">
+                                        <arg>-x</arg>
+                                        <arg>test</arg>
+                                    </args>
                                     <tasks>
                                         <task>clean</task>
-                                        <task>assemble</task>
+                                        <task>build</task>
                                         <task>publishToMavenLocal</task>
                                     </tasks>
                                 </configuration>
@@ -165,6 +171,9 @@
             <activation>
                 <property>
                     <name>skipTests</name>
+                    <!-- Maven maps bare -DskipTests to the string "true", so this matches
+                         both -DskipTests and -DskipTests=true but NOT -DskipTests=false. -->
+                    <value>true</value>
                 </property>
             </activation>
             <build>
@@ -173,14 +182,21 @@
                         <groupId>org.fortasoft</groupId>
                         <artifactId>gradle-maven-plugin</artifactId>
                         <executions>
-                            <!-- Override the gradle-build execution: swap `build` (assemble + test)
-                                 for `assemble` (no tests) when -DskipTests is set. -->
+                            <!-- Override the gradle-build execution: keep `build` (so checkstyle,
+                                 spotbugs, and other check-lifecycle tasks still run) but add
+                                 `-x test` to exclude only the Gradle test task.
+                                 combine.children="append" appends to the plugin-level <args>
+                                 instead of replacing them, preserving -P openApiGeneratorVersion. -->
                             <execution>
                                 <id>gradle-build</id>
                                 <configuration>
+                                    <args combine.children="append">
+                                        <arg>-x</arg>
+                                        <arg>test</arg>
+                                    </args>
                                     <tasks>
                                         <task>clean</task>
-                                        <task>assemble</task>
+                                        <task>build</task>
                                         <task>publishToMavenLocal</task>
                                     </tasks>
                                 </configuration>