conditionally include jspecify dependencies

Author: jpfinne

modules/openapi-generator/src/main/resources/Java/libraries/restclient/pom.mustache

@@ -319,13 +319,15 @@
             <version>${jakarta-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
+        {{^useSpringBoot4}}
         {{#useJspecify}}
         <dependency>
             <groupId>org.jspecify</groupId>
             <artifactId>jspecify</artifactId>
             <version>1.0.0</version>
         </dependency>
         {{/useJspecify}}
+        {{/useSpringBoot4}}
 
         <!-- test dependencies -->
         <dependency>

modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache

@@ -162,13 +162,15 @@
             <version>${jakarta-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
+        {{^useSpringBoot4}}
         {{#useJspecify}}
         <dependency>
             <groupId>org.jspecify</groupId>
             <artifactId>jspecify</artifactId>
             <version>1.0.0</version>
         </dependency>
         {{/useJspecify}}
+        {{/useSpringBoot4}}
 
         <!-- test dependencies -->
         <dependency>

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java

@@ -4249,30 +4249,43 @@ public void testRestClientMultipartFormParamsGuardAgainstEmptyLists() {
     @DataProvider(name = "jspecifyLibraries")
     public Object[][] jspecifyLibraries() {
         return new Object[][]{
-                {"restclient"},
-                {"webclient"},
-                {"resttemplate"},
-                {"native"}
+                {"restclient", false, true},
+                {"restclient", true, false},
+                {"webclient", false, true},
+                {"webclient", true, false},
+                {"resttemplate", false, true},
+                {"resttemplate", true, true},
+                {"native", false, true}
         };
     }
 
     @Test(dataProvider = "jspecifyLibraries")
-    public void testJspecify(String library) throws IOException {
+    public void testJspecify(String library, Boolean useSpringBoot4, boolean hasJspecifyDependency) throws IOException {
         final Map<String, File> files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library,
                 Map.of(USE_JSPECIFY, true,
-                        "containerDefaultToNull", true
+                        "containerDefaultToNull", true,
+                        USE_SPRING_BOOT4, useSpringBoot4
                 ),
                 codegenConfigurator ->
                         codegenConfigurator
                                 .setValidateSpec(false)
                                 .addTypeMapping("OffsetDateTime", "java.time.Instant")
                                 .addTypeMapping("BigDecimal", "java.math.BigDecimal"));
 
-        assertThat(files.get("pom.xml")).content()
-                .contains(
-                        "<groupId>org.jspecify</groupId>",
-                        "<artifactId>jspecify</artifactId>",
-                        "<version>1.0.0</version>");
+        if (hasJspecifyDependency) {
+            assertThat(files.get("build.gradle")).content()
+                    .contains("implementation \"org.jspecify:jspecify:1.0.0\"");
+            assertThat(files.get("pom.xml")).content()
+                    .contains(
+                            "<groupId>org.jspecify</groupId>",
+                            "<artifactId>jspecify</artifactId>",
+                            "<version>1.0.0</version>");
+        } else {
+            assertThat(files.get("build.gradle")).content()
+                    .doesNotContain("org.jspecify");
+            assertThat(files.get("pom.xml")).content()
+                    .doesNotContain("org.jspecify");
+        }
         JavaFileAssert.assertThat(files.get("Foo.java"))
                 .fileContains(
                         "import org.jspecify.annotations.Nullable;",
@@ -4297,5 +4310,6 @@ public void testJspecify(String library) throws IOException {
                 .fileContains("@org.jspecify.annotations.NullMarked");
         JavaFileAssert.assertThat(files.get("client/package-info.java"))
                 .fileContains("@org.jspecify.annotations.NullMarked");
+
     }
 }

samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/pom.xml

@@ -241,11 +241,6 @@
             <version>${jakarta-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
-        </dependency>
 
         <!-- test dependencies -->
         <dependency>

samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/pom.xml

@@ -109,11 +109,6 @@
             <version>${jakarta-annotation-version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-            <version>1.0.0</version>
-        </dependency>
 
         <!-- test dependencies -->
         <dependency>