Fix build for gradle

alex-nt · alex-nt · commit 6ecbf0ff6c9e · 2026-03-04T09:41:18.000+02:00
diff --git a/flake.nix b/flake.nix
@@ -15,6 +15,7 @@
             buildInputs = with pkgs;[
               jdk17
               maven
+              gradle
             ];
           };
       }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/build.gradle.mustache
@@ -122,7 +122,7 @@ ext {
     jakarta_annotation_version = "3.0.0"
     {{/useSpringBoot4}}
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -166,5 +166,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache
@@ -367,6 +367,6 @@
         <jodatime-version>2.14.0</jodatime-version>
         {{/joda}}
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/echo_api/java/restclient/build.gradle b/samples/client/echo_api/java/restclient/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/echo_api/java/restclient/pom.xml b/samples/client/echo_api/java/restclient/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/others/java/restclient-enum-in-multipart/build.gradle b/samples/client/others/java/restclient-enum-in-multipart/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/others/java/restclient-enum-in-multipart/pom.xml b/samples/client/others/java/restclient-enum-in-multipart/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/build.gradle b/samples/client/others/java/restclient-useAbstractionForFiles/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml b/samples/client/others/java/restclient-useAbstractionForFiles/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/build.gradle b/samples/client/petstore/java/restclient-nullable-arrays/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/pom.xml b/samples/client/petstore/java/restclient-nullable-arrays/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson2/build.gradle b/samples/client/petstore/java/restclient-springBoot4-jackson2/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "7.0.5"
     jakarta_annotation_version = "3.0.0"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson2/pom.xml b/samples/client/petstore/java/restclient-springBoot4-jackson2/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/build.gradle b/samples/client/petstore/java/restclient-springBoot4-jackson3/build.gradle
@@ -102,7 +102,7 @@ ext {
     spring_web_version = "7.0.5"
     jakarta_annotation_version = "3.0.0"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -127,5 +127,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/pom.xml b/samples/client/petstore/java/restclient-springBoot4-jackson3/pom.xml
@@ -259,6 +259,6 @@
 
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-swagger2/build.gradle b/samples/client/petstore/java/restclient-swagger2/build.gradle
@@ -104,7 +104,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -132,5 +132,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-swagger2/pom.xml b/samples/client/petstore/java/restclient-swagger2/pom.xml
@@ -276,6 +276,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle b/samples/client/petstore/java/restclient-useSingleRequestParameter/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml b/samples/client/petstore/java/restclient-useSingleRequestParameter/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>
diff --git a/samples/client/petstore/java/restclient/build.gradle b/samples/client/petstore/java/restclient/build.gradle
@@ -103,7 +103,7 @@ ext {
     spring_web_version = "6.2.16"
     jakarta_annotation_version = "2.1.1"
     jodatime_version = "2.14.0"
-    junit_version = "5.14.3"
+    junit_version = "5.10.2"
 }
 
 dependencies {
@@ -130,5 +130,4 @@ test {
     testLogging {
         events "passed", "skipped", "failed"
     }
-
 }
diff --git a/samples/client/petstore/java/restclient/pom.xml b/samples/client/petstore/java/restclient/pom.xml
@@ -270,6 +270,6 @@
         <jackson-annotations-version>2.21</jackson-annotations-version>
         <jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
         <beanvalidation-version>3.1.1</beanvalidation-version>
-        <junit-version>5.14.3</junit-version>
+        <junit-version>5.10.2</junit-version>
     </properties>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`buildInputs = with pkgs;[`
`16`	`16`	`jdk17`
`17`	`17`	`maven`
	`18`	`+ gradle`
`18`	`19`	`];`
`19`	`20`	`};`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ ext {`
`122`	`122`	`jakarta_annotation_version = "3.0.0"`
`123`	`123`	`{{/useSpringBoot4}}`
`124`	`124`	`jodatime_version = "2.14.0"`
`125`		`- junit_version = "5.14.3"`
	`125`	`+ junit_version = "5.10.2"`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`dependencies {`
`@@ -166,5 +166,4 @@ test {`
`166`	`166`	`testLogging {`
`167`	`167`	`events "passed", "skipped", "failed"`
`168`	`168`	`}`
`169`		`-`
`170`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ ext {`
`103`	`103`	`spring_web_version = "6.2.16"`
`104`	`104`	`jakarta_annotation_version = "2.1.1"`
`105`	`105`	`jodatime_version = "2.14.0"`
`106`		`- junit_version = "5.14.3"`
	`106`	`+ junit_version = "5.10.2"`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`dependencies {`
`@@ -130,5 +130,4 @@ test {`
`130`	`130`	`testLogging {`
`131`	`131`	`events "passed", "skipped", "failed"`
`132`	`132`	`}`
`133`		`-`
`134`	`133`	`}`