From ee743affc2a6b075043a68cdd3a8fb9dbce19352 Mon Sep 17 00:00:00 2001 From: Fishtail <49390359+fuyuwei01@users.noreply.github.com> Date: Tue, 28 Oct 2025 18:06:37 +0800 Subject: [PATCH] feat: upgrade springdoc to 2.8.13 (#1738) Co-authored-by: Haotian Zhang Signed-off-by: Haotian Zhang <928016560@qq.com> --- CHANGELOG.md | 1 + spring-cloud-starter-tencent-polaris-contract/pom.xml | 4 ++-- .../org/springdoc/api/AbstractOpenApiResourceUtil.java | 7 ++++++- spring-cloud-tencent-dependencies/pom.xml | 6 +++--- .../tencent/cloud/quickstart/callee/CustomMetadata.java | 1 - .../src/main/resources/application.yml | 1 + .../tencent/cloud/quickstart/callee/CustomMetadata.java | 1 - .../src/main/resources/application.yml | 1 + 8 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eca613602..4d11711e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,3 +27,4 @@ - [test:add junit tests to sct-common.](https://github.com/Tencent/spring-cloud-tencent/pull/1726) - [test:add junit tests to sct-gw-plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1729) - [feat:compatible metadata transfer with TSF SDK version 1.x.](https://github.com/Tencent/spring-cloud-tencent/pull/1734) +- [feat: upgrade springdoc to 2.8.13](https://github.com/Tencent/spring-cloud-tencent/pull/1738) diff --git a/spring-cloud-starter-tencent-polaris-contract/pom.xml b/spring-cloud-starter-tencent-polaris-contract/pom.xml index 30f33c651..7e92dbb03 100644 --- a/spring-cloud-starter-tencent-polaris-contract/pom.xml +++ b/spring-cloud-starter-tencent-polaris-contract/pom.xml @@ -37,7 +37,7 @@ org.springdoc - springdoc-openapi-starter-webmvc-ui + springdoc-openapi-starter-webmvc-api org.springframework @@ -52,7 +52,7 @@ org.springdoc - springdoc-openapi-starter-webflux-ui + springdoc-openapi-starter-webflux-api org.springframework diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/org/springdoc/api/AbstractOpenApiResourceUtil.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/org/springdoc/api/AbstractOpenApiResourceUtil.java index 3d9bac9f2..c992eef1e 100644 --- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/org/springdoc/api/AbstractOpenApiResourceUtil.java +++ b/spring-cloud-starter-tencent-polaris-contract/src/main/java/org/springdoc/api/AbstractOpenApiResourceUtil.java @@ -32,6 +32,11 @@ public final class AbstractOpenApiResourceUtil { } public static OpenAPI getOpenApi(AbstractOpenApiResource openApiResource) { - return openApiResource.getOpenApi(Locale.getDefault()); + try { + return openApiResource.getOpenApi(null, Locale.getDefault()); + } + catch (NoSuchMethodError e) { + throw new RuntimeException("Spring Cloud Tencent Contract Report is not compatible with current version spring-doc. Please upgrade spring-doc to 2.8.13 or higher."); + } } } diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 66458ed9d..a3e90b386 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -77,7 +77,7 @@ 2.1.0.0 - 2.2.0 + 2.8.13 1.3.0 @@ -229,13 +229,13 @@ org.springdoc - springdoc-openapi-starter-webmvc-ui + springdoc-openapi-starter-webmvc-api ${springdoc.version} org.springdoc - springdoc-openapi-starter-webflux-ui + springdoc-openapi-starter-webflux-api ${springdoc.version} diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java index db17364be..e1bdf3d17 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java @@ -36,7 +36,6 @@ public class CustomMetadata implements InstanceMetadataProvider { public Map getMetadata() { Map metadata = new HashMap<>(); metadata.put("k1", "v1"); - metadata.put("lane", "lane1"); return metadata; } diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml index 973625425..f2f37db03 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/application.yml @@ -13,6 +13,7 @@ spring: discovery: enabled: true register: true + version: 1.0.0 contract: exposure: true report: diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java index b9234f58e..a0d574cb0 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/java/com/tencent/cloud/quickstart/callee/CustomMetadata.java @@ -36,7 +36,6 @@ public class CustomMetadata implements InstanceMetadataProvider { public Map getMetadata() { Map metadata = new HashMap<>(); metadata.put("k1", "v2"); - metadata.put("lane", "lane2"); return metadata; } diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/application.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/application.yml index 401ef2aef..67f6377c9 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/application.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/application.yml @@ -13,6 +13,7 @@ spring: discovery: enabled: true register: true + version: 1.0.1 contract: exposure: true report: