build: bump swagger to 2.2.42

Author: ndr-brt

gradle/libs.versions.toml

@@ -14,7 +14,7 @@ jupiter = "6.0.2"
 mockito = "5.21.0"
 openapi-merger = "1.0.5"
 openapi-generator = "7.19.0"
-swagger = "2.2.26"
+swagger = "2.2.42"
 swagger-parser = "2.1.38"
 
 [libraries]

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/EdcBuildPlugin.java

@@ -15,6 +15,7 @@
 
 package org.eclipse.edc.plugins.edcbuild;
 
+import org.eclipse.edc.plugins.edcbuild.conventions.EdcConvention;
 import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
 import org.eclipse.edc.plugins.edcbuild.plugins.ModuleNamesPlugin;
 import org.eclipse.edc.plugins.edcbuild.plugins.OpenApiMergerPlugin;
@@ -29,6 +30,9 @@
 import org.gradle.crypto.checksum.ChecksumPlugin;
 import org.gradle.plugins.signing.Sign;
 
+import java.util.Map;
+import java.util.stream.Stream;
+
 import static java.util.List.of;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.allDependencies;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.checkstyle;
@@ -37,13 +41,15 @@
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPom;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPublication;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.mavenPublishing;
+import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.openApiMerger;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.printClasspath;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.repositories;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.rootBuildScript;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.signing;
-import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.swagger;
+import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.swaggerGenerator;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.tests;
 import static org.eclipse.edc.plugins.edcbuild.conventions.Conventions.waitForPublishedArtifacts;
+import static org.gradle.api.plugins.JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME;
 
 /**
  * Adds (opinionated) conventions (=configuration) for various plugins.
@@ -62,6 +68,13 @@ public void apply(Project target) {
             task.mustRunAfter(signTasks);
         });
 
+        of(
+                rootBuildScript(),
+                repositories(),
+                swaggerGenerator(),
+                openApiMerger()
+        ).forEach(c -> c.apply(target));
+
         // configuration values are only guaranteed to be set after the project has been evaluated
         // https://docs.gradle.org/current/userguide/build_lifecycle.html
         target.afterEvaluate(project -> {
@@ -71,8 +84,6 @@ public void apply(Project target) {
 
             // apply the conventions
             of(
-                    rootBuildScript(),
-                    repositories(),
                     defaultDependencies(),
                     checkstyle(),
                     mavenPublishing(),
@@ -82,7 +93,6 @@ public void apply(Project target) {
                     allDependencies(),
                     tests(),
                     jar(),
-                    swagger(),
                     printClasspath(),
                     waitForPublishedArtifacts()
             ).forEach(c -> c.apply(project));

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/Conventions.java

@@ -59,10 +59,6 @@ public static EdcConvention rootBuildScript() {
         return new RootBuildScriptConvention();
     }
 
-    public static EdcConvention swagger() {
-        return new SwaggerConvention();
-    }
-
     public static EdcConvention swaggerGenerator() {
         return new SwaggerResolveConvention();
     }

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/OpenApiMergerConvention.java

@@ -21,7 +21,7 @@
 import java.util.function.Supplier;
 
 import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;
-import static org.eclipse.edc.plugins.edcbuild.conventions.SwaggerConvention.defaultOutputDirectory;
+import static org.eclipse.edc.plugins.edcbuild.conventions.SwaggerResolveConvention.defaultOutputDirectory;
 
 /**
  * Configures inputs and outputs for the OpenAPI merger plugin

plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerConvention.java

@@ -15,18 +15,19 @@
 package org.eclipse.edc.plugins.edcbuild.conventions;
 
 import io.swagger.v3.plugins.gradle.tasks.ResolveTask;
-import org.eclipse.edc.plugins.edcbuild.Versions;
 import org.eclipse.edc.plugins.edcbuild.extensions.BuildExtension;
 import org.eclipse.edc.plugins.edcbuild.tasks.PrintApiGroupTask;
 import org.gradle.api.Project;
+import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.jspecify.annotations.NonNull;
 
 import java.nio.file.Path;
-import java.util.Map;
 import java.util.stream.Stream;
 
+import static org.eclipse.edc.plugins.edcbuild.Versions.JAKARTA_WS_RS;
+import static org.eclipse.edc.plugins.edcbuild.Versions.SWAGGER;
 import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;
-import static org.eclipse.edc.plugins.edcbuild.conventions.SwaggerConvention.defaultOutputDirectory;
 import static org.gradle.api.plugins.JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME;
 
 /**
@@ -37,46 +38,48 @@ class SwaggerResolveConvention implements EdcConvention {
     private static final String DEFAULT_API_GROUP = "";
     public static final String SWAGGER_GRADLE_PLUGIN = "io.swagger.core.v3.swagger-gradle-plugin";
 
+    public static Path defaultOutputDirectory(Project project) {
+        return Path.of(project.getRootProject().getProjectDir().getAbsolutePath(), "resources/openapi/yaml");
+    }
+
     @Override
     public void apply(Project target) {
         target.getPluginManager().withPlugin(SWAGGER_GRADLE_PLUGIN, appliedPlugin -> {
 
             target.getTasks().register("apiGroups", PrintApiGroupTask.class);
 
             Stream.of(
-                    "io.swagger.core.v3:swagger-jaxrs2-jakarta:%s".formatted(Versions.SWAGGER),
-                    "jakarta.ws.rs:jakarta.ws.rs-api:%s".formatted(Versions.JAKARTA_WS_RS)
+                    "io.swagger.core.v3:swagger-jaxrs2-jakarta:%s".formatted(SWAGGER),
+                    "jakarta.ws.rs:jakarta.ws.rs-api:%s".formatted(JAKARTA_WS_RS)
             ).forEach(dependency -> target.getDependencies().add(IMPLEMENTATION_CONFIGURATION_NAME, dependency));
 
-            var classpath = requireExtension(target, JavaPluginExtension.class)
-                    .getSourceSets().getAt("main").getRuntimeClasspath();
             var swaggerExt = requireExtension(target, BuildExtension.class).getSwagger();
 
             var resourcePkgs = swaggerExt.getResourcePackages(); // already provides the default
 
-            target.getTasks().withType(ResolveTask.class, task -> {
+            target.getTasks().withType(ResolveTask.class).configureEach(task -> {
                 var outputFileName = swaggerExt.getOutputFilename().getOrElse(target.getName());
                 var fallbackOutputDir = defaultOutputDirectory(target);
                 var apiGroup = swaggerExt.getApiGroup().getOrElse(DEFAULT_API_GROUP);
 
                 var outputDir = Path.of(swaggerExt.getOutputDirectory().getOrElse(fallbackOutputDir.toFile()).toURI())
                         .resolve(apiGroup)
-                        .toFile();
+                        .toString();
 
                 task.setOutputFileName(outputFileName);
                 task.setOutputDir(outputDir);
                 task.setOutputFormat(ResolveTask.Format.YAML);
                 task.setSortOutput(true);
                 task.setPrettyPrint(true);
-                task.setClasspath(classpath);
+                task.setClasspath(getClasspath(target));
                 task.setBuildClasspath(task.getClasspath());
                 task.setResourcePackages(resourcePkgs);
             });
 
             target.getTasks().register("openapi", ResolveTask.class).configure(task -> {
                 var outputDir = target.getLayout().getBuildDirectory().getAsFile().get().toPath()
                         .resolve("docs").resolve("openapi")
-                        .toFile();
+                        .toString();
 
                 target.getTasks().findByName("jar").dependsOn(task);
                 task.setGroup("documentation");
@@ -86,13 +89,16 @@ public void apply(Project target) {
                 task.setOutputFormat(ResolveTask.Format.YAML);
                 task.setSortOutput(true);
                 task.setPrettyPrint(true);
-                task.setClasspath(classpath);
+                task.setClasspath(getClasspath(target));
                 task.setBuildClasspath(task.getClasspath());
                 task.setResourcePackages(resourcePkgs);
             });
 
-            target.getConfigurations().all(c -> c.exclude(Map.of("group", "com.fasterxml.jackson.jaxrs",
-                    "module", "jackson-jaxrs-json-provider")));
         });
     }
+
+    private static @NonNull FileCollection getClasspath(Project target) {
+        return requireExtension(target, JavaPluginExtension.class)
+                .getSourceSets().getAt("main").getRuntimeClasspath();
+    }
 }