feat: upgrade springdoc to 2.8.13 (#1738)

Co-authored-by: Haotian Zhang <skyebefreeman@qq.com>
Signed-off-by: Haotian Zhang <928016560@qq.com>

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)

spring-cloud-starter-tencent-polaris-contract/pom.xml

@@ -37,7 +37,7 @@
 
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>
@@ -52,7 +52,7 @@
 
 		<dependency>
 			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+			<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
 			<exclusions>
 				<exclusion>
 					<groupId>org.springframework</groupId>

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.");
+		}
 	}
 }

spring-cloud-tencent-dependencies/pom.xml

@@ -77,7 +77,7 @@
 		<polaris.version>2.1.0.0</polaris.version>
 
 		<!-- Dependencies -->
-		<springdoc.version>2.2.0</springdoc.version>
+		<springdoc.version>2.8.13</springdoc.version>
 
 		<!-- Maven Plugin Versions -->
 		<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@@ -229,13 +229,13 @@
 			<!-- third part framework dependencies -->
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+				<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.springdoc</groupId>
-				<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+				<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
 				<version>${springdoc.version}</version>
 			</dependency>
 

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<String, String> getMetadata() {
 		Map<String, String> metadata = new HashMap<>();
 		metadata.put("k1", "v1");
-		metadata.put("lane", "lane1");
 		return metadata;
 	}
 

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:

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<String, String> getMetadata() {
 		Map<String, String> metadata = new HashMap<>();
 		metadata.put("k1", "v2");
-		metadata.put("lane", "lane2");
 		return metadata;
 	}
 

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: