Skip to content

Commit

Permalink
#2382 to upgrade spring boot to 2.7.10
Browse files Browse the repository at this point in the history
  • Loading branch information
gavin2lee committed Jul 13, 2023
1 parent 84856eb commit 778e017
Show file tree
Hide file tree
Showing 6 changed files with 358 additions and 299 deletions.
6 changes: 3 additions & 3 deletions platform-auth-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<java.encoding>UTF-8</java.encoding>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<jackson.version>2.13.4</jackson.version>
<springboot.version>2.5.14</springboot.version>
<springboot.version>2.7.10</springboot.version>
</properties>

<dependencyManagement>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.31</version>
<version>2.0</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
5 changes: 3 additions & 2 deletions platform-auth-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<app.version>${project.version}</app.version>

<springboot.version>2.5.14</springboot.version>
<springboot.version>2.7.10</springboot.version>
<jackson.version>2.13.4</jackson.version>
<spring-security.version>5.5.8</spring-security.version>
</properties>
Expand All @@ -36,7 +36,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down Expand Up @@ -98,6 +98,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
</dependency>

<dependency>
Expand Down
8 changes: 4 additions & 4 deletions platform-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<java.version>1.8</java.version>
<java.encoding>UTF-8</java.encoding>
<app.version>${project.version}</app.version>
<springboot.version>2.5.14</springboot.version>
<springboot.version>2.7.10</springboot.version>
<spring-version>5.2.22.RELEASE</spring-version>
<jackson.version>2.13.4</jackson.version>
</properties>
Expand All @@ -33,7 +33,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<version>2.13.4.2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
Expand All @@ -49,7 +49,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.31</version>
<version>2.0</version>
</dependency>

<dependency>
Expand All @@ -63,7 +63,6 @@
<artifactId>log4j-to-slf4j</artifactId>
<version>2.17.1</version>
</dependency>

</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -186,6 +185,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.28</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
14 changes: 10 additions & 4 deletions platform-gateway/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<properties>
<java.version>1.8</java.version>
<java.encoding>UTF-8</java.encoding>
<springboot.version>2.2.13.RELEASE</springboot.version>
<springboot.version>2.7.10</springboot.version>
<spring-version>5.2.22.RELEASE</spring-version>
<springcloud.version>Greenwich.SR2</springcloud.version>
<springcloud.version>2021.0.8</springcloud.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<jackson.version>2.13.4</jackson.version>
</properties>
Expand Down Expand Up @@ -62,6 +62,8 @@
<version>1.9.4</version>
</dependency>

<!--
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId>
Expand Down Expand Up @@ -145,11 +147,11 @@
<artifactId>spring-expression</artifactId>
<version>${spring-version}</version>
</dependency>

-->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.31</version>
<version>2.0</version>
</dependency>

<dependency>
Expand All @@ -176,10 +178,12 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-gateway</artifactId>
</dependency>
<!--
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-contract-stub-runner</artifactId>
Expand All @@ -202,6 +206,7 @@
<version>0.7.0</version>
</dependency>

<!--
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand All @@ -213,6 +218,7 @@
</exclusion>
</exclusions>
</dependency>
-->
</dependencies>


Expand Down
Loading

0 comments on commit 778e017

Please sign in to comment.