Skip to content

build(deps): bump swagger plugin to 2.2.40 #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ndr-brt merged 1 commit into from
Nov 19, 2025
Merged

build(deps): bump swagger plugin to 2.2.40 #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jupiter = "6.0.1"
mockito = "5.20.0"
openapi-merger = "1.0.5"
openapi-generator = "7.16.0"
swagger = "2.2.26"
swagger = "2.2.40"
swagger-parser = "2.1.35"

[libraries]
Expand Down
8 changes: 2 additions & 6 deletions .../src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConvention.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.gradle.api.plugins.JavaPluginExtension;

import java.nio.file.Path;
import java.util.Map;
import java.util.stream.Stream;

import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension;
Expand Down Expand Up @@ -61,7 +60,7 @@ public void apply(Project target) {

var outputDir = Path.of(swaggerExt.getOutputDirectory().getOrElse(fallbackOutputDir.toFile()).toURI())
.resolve(apiGroup)
.toFile();
.toAbsolutePath().toString();

task.setOutputFileName(outputFileName);
task.setOutputDir(outputDir);
Expand All @@ -76,7 +75,7 @@ public void apply(Project target) {
target.getTasks().register("openapi", ResolveTask.class).configure(task -> {
var outputDir = target.getLayout().getBuildDirectory().getAsFile().get().toPath()
.resolve("docs").resolve("openapi")
.toFile();
.toAbsolutePath().toString();

target.getTasks().findByName("jar").dependsOn(task);
task.setGroup("documentation");
Expand All @@ -90,9 +89,6 @@ public void apply(Project 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")));
});
}
}
31 changes: 19 additions & 12 deletions .../test/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConventionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ void setUp() {
project = ProjectBuilder.builder().withName(PROJECT_NAME).build();
project.getPluginManager().apply(SWAGGER_GRADLE_PLUGIN);
project.getPluginManager().apply(JavaPlugin.class);
project.getRepositories().mavenCentral();
project.getExtensions().create("edcBuild", BuildExtension.class, project.getObjects());
}

Expand All @@ -45,11 +46,13 @@ void apply_whenApiGroupNotSpecified_shouldUseDefault() {
var convention = new SwaggerResolveConvention();
convention.apply(project);

var resolveTask = (ResolveTask) project.getTasks().getByName("resolve");
var task = project.getTasks().getByName("resolve");

assertThat(resolveTask.getOutputDir().toString()).endsWith("/resources/openapi/yaml");
assertThat(resolveTask.getOutputFileName()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat()).isEqualTo(ResolveTask.Format.YAML);
assertThat(task).isInstanceOfSatisfying(ResolveTask.class, resolveTask -> {
assertThat(resolveTask.getOutputDir().get().getAsFile().getAbsolutePath()).endsWith("/resources/openapi/yaml");
assertThat(resolveTask.getOutputFileName().get()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat().get()).isEqualTo(ResolveTask.Format.YAML);
});
}

@Test
Expand All @@ -59,11 +62,13 @@ void apply_whenApiGroupSpecified_shouldAppend() {
var convention = new SwaggerResolveConvention();
convention.apply(project);

var resolveTask = (ResolveTask) project.getTasks().getByName("resolve");
var task = project.getTasks().getByName("resolve");

assertThat(resolveTask.getOutputDir().toString()).endsWith("/resources/openapi/yaml/test-api");
assertThat(resolveTask.getOutputFileName()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat()).isEqualTo(ResolveTask.Format.YAML);
assertThat(task).isInstanceOfSatisfying(ResolveTask.class, resolveTask -> {
assertThat(resolveTask.getOutputDir().get().getAsFile().getAbsolutePath()).endsWith("/resources/openapi/yaml/test-api");
assertThat(resolveTask.getOutputFileName().get()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat().get()).isEqualTo(ResolveTask.Format.YAML);
});
}

@Test
Expand All @@ -74,10 +79,12 @@ void apply_whenOutputDirSet_shouldAppend() {
var convention = new SwaggerResolveConvention();
convention.apply(project);

var resolveTask = (ResolveTask) project.getTasks().getByName("resolve");
var task = project.getTasks().getByName("resolve");

assertThat(resolveTask.getOutputDir().toString()).endsWith("/some/funny/path/test-api");
assertThat(resolveTask.getOutputFileName()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat()).isEqualTo(ResolveTask.Format.YAML);
assertThat(task).isInstanceOfSatisfying(ResolveTask.class, resolveTask -> {
assertThat(resolveTask.getOutputDir().get().getAsFile().getAbsolutePath()).endsWith("/some/funny/path/test-api");
assertThat(resolveTask.getOutputFileName().get()).isEqualTo(PROJECT_NAME);
assertThat(resolveTask.getOutputFormat().get()).isEqualTo(ResolveTask.Format.YAML);
});
}
}