From 205dd7a99dd860bdfccd6eb69a7420ae5892d276 Mon Sep 17 00:00:00 2001 From: ndr_brt Date: Wed, 8 May 2024 16:15:17 +0200 Subject: [PATCH] build: make swagger be upgraded by dependabot --- buildSrc/build.gradle.kts | 5 +++-- gradle/libs.versions.toml | 5 ++++- .../conventions/SwaggerResolveConvention.java | 11 ++++++++--- .../conventions/SwaggerResolveConventionTest.java | 3 ++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index ccce350..b84106c 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -90,10 +90,11 @@ val createVersions = tasks.register("createVersions") { val head = "$copyright\n\npackage org.eclipse.edc.plugins.edcbuild;\npublic interface Versions {\n" val tail = "\n}"; - val constants = listOf("assertj", "checkstyle", "jupiter", "mockito") + val constants = listOf("assertj", "checkstyle", "jakarta-ws-rs", "jupiter", "mockito", "swagger") .mapNotNull { name -> + val constantName = name.uppercase().replace("-", "_") catalog.findVersion(name) - .map { version -> " String %s = \"%s\";".format(name.uppercase(), version) } + .map { version -> " String %s = \"%s\";".format(constantName, version) } .orElse(null) } .joinToString("\n", head, tail) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5aa8073..94590fc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,8 +7,10 @@ checkstyle = "10.16.0" edc = "0.6.4-SNAPSHOT" jackson = "2.17.1" jetbrainsAnnotation = "24.0.1" +jakarta-ws-rs = "3.1.0" jupiter = "5.10.1" mockito = "5.11.0" +swagger = "2.2.21" [libraries] assertj-core = { module = "org.assertj:assertj-core", version.ref = "assertj" } @@ -17,6 +19,7 @@ edc-runtime-metamodel = { module = "org.eclipse.edc:runtime-metamodel", version. edc-core-spi = { module = "org.eclipse.edc:core-spi", version.ref = "edc" } jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson" } jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } +jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "jakarta-ws-rs" } jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotation" } jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } @@ -24,7 +27,7 @@ plugin-checksum = { module = "gradle.plugin.org.gradle.crypto:checksum", version plugin-nexus-publish = { module = "io.github.gradle-nexus:publish-plugin", version = "1.3.0" } plugin-openapi-merger = { module = "com.rameshkp:openapi-merger-gradle-plugin", version = "1.0.5" } plugin-openapi-merger-app = { module = "com.rameshkp:openapi-merger-app", version = "1.0.5" } -plugin-swagger = { module = "io.swagger.core.v3:swagger-gradle-plugin", version = "2.2.15" } +plugin-swagger = { module = "io.swagger.core.v3:swagger-gradle-plugin", version.ref = "swagger" } # third party j2html = { module = "com.j2html:j2html", version = "1.6.0" } diff --git a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConvention.java b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConvention.java index 8fad07c..f68b20e 100644 --- a/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConvention.java +++ b/plugins/edc-build/src/main/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConvention.java @@ -15,6 +15,7 @@ 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; @@ -22,6 +23,7 @@ import java.nio.file.Path; import java.util.Map; +import java.util.stream.Stream; import static org.eclipse.edc.plugins.edcbuild.conventions.ConventionFunctions.requireExtension; import static org.eclipse.edc.plugins.edcbuild.conventions.SwaggerConvention.defaultOutputDirectory; @@ -33,15 +35,18 @@ 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"; @Override public void apply(Project target) { - target.getPluginManager().withPlugin("io.swagger.core.v3.swagger-gradle-plugin", appliedPlugin -> { + target.getPluginManager().withPlugin(SWAGGER_GRADLE_PLUGIN, appliedPlugin -> { target.getTasks().register("apiGroups", PrintApiGroupTask.class); - target.getDependencies().add(IMPLEMENTATION_CONFIGURATION_NAME, "io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.15"); - target.getDependencies().add(IMPLEMENTATION_CONFIGURATION_NAME, "jakarta.ws.rs:jakarta.ws.rs-api:3.1.0"); + 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) + ).forEach(dependency -> target.getDependencies().add(IMPLEMENTATION_CONFIGURATION_NAME, dependency)); var javaExt = requireExtension(target, JavaPluginExtension.class); var swaggerExt = requireExtension(target, BuildExtension.class).getSwagger(); diff --git a/plugins/edc-build/src/test/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConventionTest.java b/plugins/edc-build/src/test/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConventionTest.java index 3907ef9..2969fff 100644 --- a/plugins/edc-build/src/test/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConventionTest.java +++ b/plugins/edc-build/src/test/java/org/eclipse/edc/plugins/edcbuild/conventions/SwaggerResolveConventionTest.java @@ -25,6 +25,7 @@ import java.io.File; import static org.assertj.core.api.Assertions.assertThat; +import static org.eclipse.edc.plugins.edcbuild.conventions.SwaggerResolveConvention.SWAGGER_GRADLE_PLUGIN; class SwaggerResolveConventionTest { @@ -34,7 +35,7 @@ class SwaggerResolveConventionTest { @BeforeEach void setUp() { project = ProjectBuilder.builder().withName(PROJECT_NAME).build(); - project.getPluginManager().apply("io.swagger.core.v3.swagger-gradle-plugin"); + project.getPluginManager().apply(SWAGGER_GRADLE_PLUGIN); project.getPluginManager().apply(JavaPlugin.class); project.getExtensions().create("edcBuild", BuildExtension.class, project.getObjects()); }