From 098b7098a606f3eb219b2cf161c42246edd5a7a6 Mon Sep 17 00:00:00 2001
From: Haotian Zhang <skyebefreeman@qq.com>
Date: Tue, 2 Jul 2024 13:02:30 +0800
Subject: [PATCH] fix:fix app starting failed when user using custom OpenAPI
 bean. (#1330)

---
 CHANGELOG.md                                                | 3 ++-
 pom.xml                                                     | 6 +++---
 .../polaris/contract/config/PolarisContractProperties.java  | 2 +-
 .../contract/config/PolarisSwaggerAutoConfiguration.java    | 1 +
 .../cloud/polaris/contract/tsf/TsfContractProperties.java   | 2 +-
 spring-cloud-tencent-dependencies/pom.xml                   | 4 ++--
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d0fb7fc..eb5d7150 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,4 +21,5 @@
 - [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1319)
 - [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1322)
 - [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1324)
-- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1329)
\ No newline at end of file
+- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1329)
+- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1330)
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fd057cfe..5781df97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,13 +89,13 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
+		<revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
-		<spring.framework.version>6.0.17</spring.framework.version>
+		<spring.framework.version>6.0.22</spring.framework.version>
 
 		<!-- Spring Boot -->
-		<spring.boot.version>3.1.8</spring.boot.version>
+		<spring.boot.version>3.1.12</spring.boot.version>
 
 		<!-- Spring Cloud -->
 		<spring.cloud.version>2022.0.5</spring.cloud.version>
diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
index 0fdc0a1d..3f698288 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
+++ b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisContractProperties.java
@@ -46,7 +46,7 @@ public class PolarisContractProperties implements ContractProperties {
 	/**
 	 * Group to create swagger docket.
 	 */
-	private String group = "default";
+	private String group = "polaris";
 	/**
 	 * Base paths to be scanned. Split by ",".
 	 */
diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
index 885c9ffd..72174143 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
+++ b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/config/PolarisSwaggerAutoConfiguration.java
@@ -83,6 +83,7 @@ public class PolarisSwaggerAutoConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public OpenAPI polarisOpenAPI() {
 		return new OpenAPI()
 				.info(new Info()
diff --git a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
index 74e48d80..64cd7105 100644
--- a/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
+++ b/spring-cloud-starter-tencent-polaris-contract/src/main/java/com/tencent/cloud/polaris/contract/tsf/TsfContractProperties.java
@@ -39,7 +39,7 @@ public class TsfContractProperties implements ExtendedContractProperties {
 	@Value("${tsf.swagger.enabled:true}")
 	private boolean enabled;
 
-	@Value("${tsf.swagger.group:default}")
+	@Value("${tsf.swagger.group:polaris}")
 	private String groupName;
 
 	@Value("${tsf.swagger.basePath:/**}")
diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml
index f78d4524..a31c20ed 100644
--- a/spring-cloud-tencent-dependencies/pom.xml
+++ b/spring-cloud-tencent-dependencies/pom.xml
@@ -71,10 +71,10 @@
 
 	<properties>
 		<!-- Project revision -->
-		<revision>1.14.0-2022.0.5-SNAPSHOT</revision>
+		<revision>2.0.0.0-2022.0.5-SNAPSHOT</revision>
 
 		<!-- Polaris SDK version -->
-		<polaris.version>1.15.8-SNAPSHOT</polaris.version>
+		<polaris.version>2.0.0.0-SNAPSHOT</polaris.version>
 
 		<!-- Dependencies -->
 		<guava.version>32.0.1-jre</guava.version>