Merge branch '2.6.x' into 2.7.x
Closes gh-31402
This commit is contained in:
@@ -21,8 +21,8 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.bouncycastle</groupId>
|
||||
<artifactId>bcpg-jdk15to18</artifactId>
|
||||
<version>1.68</version>
|
||||
<artifactId>bcpg-jdk18on</artifactId>
|
||||
<version>1.71</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
|
||||
@@ -17,6 +17,6 @@ dependencies {
|
||||
testImplementation("org.springframework:spring-test")
|
||||
|
||||
testRuntimeOnly("ch.qos.logback:logback-classic")
|
||||
testRuntimeOnly("org.bouncycastle:bcprov-jdk16:1.46")
|
||||
testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.71")
|
||||
testRuntimeOnly("org.springframework:spring-webmvc")
|
||||
}
|
||||
@@ -14,7 +14,7 @@ repositories {
|
||||
|
||||
dependencies {
|
||||
implementation("org.springframework.boot:spring-boot-starter")
|
||||
implementation("org.bouncycastle:bcprov-jdk15on:1.70")
|
||||
implementation("org.bouncycastle:bcprov-jdk18on:1.71")
|
||||
}
|
||||
|
||||
bootJar {
|
||||
|
||||
Reference in New Issue
Block a user