Merge remote-tracking branch 'origin/master' into 6.0.x

This commit is contained in:
William Cheng
2021-10-06 12:00:02 +08:00
1650 changed files with 36995 additions and 6074 deletions

View File

@@ -8,7 +8,7 @@
<properties>
<kotlin.version>1.3.30</kotlin.version>
<kotlinx-coroutines.version>1.2.0</kotlinx-coroutines.version>
<javax-annotation-version>1.3.2</javax-annotation-version>
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
</properties>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -121,13 +121,13 @@
</dependency>
<!-- Bean Validation API support -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>${javax-annotation-version}</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>
<dependency>