fix: remove conflict dependencies management

pull/1699/head
shedfreewu 1 month ago committed by Haotian Zhang
parent 616c9f2358
commit 636cd17369

@ -7,3 +7,4 @@
- [fix: fix ConfigChangeListener ut bug](https://github.com/Tencent/spring-cloud-tencent/pull/1659)
- [feat: support tsf gw.](https://github.com/Tencent/spring-cloud-tencent/pull/1697)
- [fix: tsf related bugfixes](https://github.com/Tencent/spring-cloud-tencent/pull/1698)
- [fix: remove conflict dependencies management](https://github.com/Tencent/spring-cloud-tencent/pull/1699)

@ -101,6 +101,9 @@
<!-- Spring Cloud -->
<spring.cloud.version>2021.0.9</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>
<maven-source-plugin.version>3.2.0</maven-source-plugin.version>
@ -153,6 +156,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>

@ -74,14 +74,13 @@
<revision>2.1.0.0-2021.0.9-SNAPSHOT</revision>
<!-- Polaris SDK version -->
<polaris.version>2.0.3.0-SNAPSHOT</polaris.version>
<polaris.version>2.1.0.0-SNAPSHOT</polaris.version>
<!-- Dependencies -->
<bcpkix-jdk18on.version>1.78.1</bcpkix-jdk18on.version>
<byte-buddy.version>1.14.19</byte-buddy.version>
<jackson.version>2.15.3</jackson.version>
<mocktio.version>4.9.0</mocktio.version>
<system-stubs-jupiter.version>2.0.2</system-stubs-jupiter.version>
<snakeyaml.version>2.0</snakeyaml.version>
<springdoc.version>1.7.0</springdoc.version>
@ -276,13 +275,6 @@
<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