fix: remove conflict dependencies management (#1683)

pull/1684/head
Fishtail 1 month ago committed by GitHub
parent f2a1cef179
commit 61aba281e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -9,3 +9,4 @@
- [feat: support spring-retry and feign config refresh and feign eager load support schema](https://github.com/Tencent/spring-cloud-tencent/pull/1651)
- [fix: fix ConfigChangeListener ut bug](https://github.com/Tencent/spring-cloud-tencent/pull/1661)
- [fix: tsf 2024 related bugfixes](https://github.com/Tencent/spring-cloud-tencent/pull/1682)
- [fix: remove conflict dependencies management](https://github.com/Tencent/spring-cloud-tencent/pull/1683)

@ -101,6 +101,9 @@
<!-- Spring Cloud -->
<spring.cloud.version>2023.0.6</spring.cloud.version>
<!-- Test -->
<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
<!-- Maven Plugin Versions -->
<jacoco.version>0.8.12</jacoco.version>
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@ -151,6 +154,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>${system-stubs-jupiter.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

@ -78,10 +78,6 @@
<!-- Dependencies -->
<springdoc.version>2.2.0</springdoc.version>
<mocktio.version>4.9.0</mocktio.version>
<byte-buddy.version>1.14.19</byte-buddy.version>
<jackson.version>2.15.4</jackson.version>
<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
<!-- Maven Plugin Versions -->
<flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
@ -90,14 +86,6 @@
<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- polaris starter-->
<dependency>
<groupId>com.tencent.cloud</groupId>
@ -227,33 +215,6 @@
<version>${springdoc.version}</version>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${byte-buddy.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mocktio.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mocktio.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>uk.org.webcompere</groupId>
<artifactId>system-stubs-jupiter</artifactId>
<version>${system-stubs-jupiter.version}</version>
<scope>test</scope>
</dependency>
<!-- polaris SDK-->
<dependency>
<artifactId>polaris-all</artifactId>

Loading…
Cancel
Save