From 4882bbd01fe67438a006901704f6db55bee61989 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jul 2024 06:20:15 +0000 Subject: [PATCH 1/2] fix(deps): bump org.springdoc:springdoc-openapi-starter-webmvc-api Bumps [org.springdoc:springdoc-openapi-starter-webmvc-api](https://github.com/springdoc/springdoc-openapi) from 2.5.0 to 2.6.0. - [Release notes](https://github.com/springdoc/springdoc-openapi/releases) - [Changelog](https://github.com/springdoc/springdoc-openapi/blob/main/CHANGELOG.md) - [Commits](https://github.com/springdoc/springdoc-openapi/compare/v2.5.0...v2.6.0) --- updated-dependencies: - dependency-name: org.springdoc:springdoc-openapi-starter-webmvc-api dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- sda-commons-dependencies/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sda-commons-dependencies/build.gradle b/sda-commons-dependencies/build.gradle index 5d5f2e685..84c82f677 100644 --- a/sda-commons-dependencies/build.gradle +++ b/sda-commons-dependencies/build.gradle @@ -48,7 +48,7 @@ dependencies { } api "ch.qos.logback.contrib:logback-json-classic:${logbackContribVersion}" api "ch.qos.logback.contrib:logback-jackson:${logbackContribVersion}" - api 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.5.0' + api 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.6.0' api "io.opentelemetry:opentelemetry-api-incubator:1.39.0-alpha", { because "conflict within transitive dependencies of Spring Boot Dependencies" } From fa755b2093523b17a762c456080b81dccd0b84d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Siebahn?= Date: Mon, 1 Jul 2024 09:09:36 +0200 Subject: [PATCH 2/2] fix(openapi): add new `HttpRequest` parameter to `ServerBaseUrlCustomizer` to fulfill changed API of springdoc-openapi --- .../spring/boot/web/docs/SdaOpenApiCustomizerConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sda-commons-starter-web/src/main/java/org/sdase/commons/spring/boot/web/docs/SdaOpenApiCustomizerConfiguration.java b/sda-commons-starter-web/src/main/java/org/sdase/commons/spring/boot/web/docs/SdaOpenApiCustomizerConfiguration.java index 585fa2c1e..e2ad37903 100644 --- a/sda-commons-starter-web/src/main/java/org/sdase/commons/spring/boot/web/docs/SdaOpenApiCustomizerConfiguration.java +++ b/sda-commons-starter-web/src/main/java/org/sdase/commons/spring/boot/web/docs/SdaOpenApiCustomizerConfiguration.java @@ -21,7 +21,7 @@ public class SdaOpenApiCustomizerConfiguration { @Bean public ServerBaseUrlCustomizer removeServerBaseUrl() { - return serverBaseUrl -> null; + return (serverBaseUrl, httpRequest) -> null; } @Bean