Merge branch '2.6.x' into 2.7.x

Closes gh-31402
spring-projects · Jun 16, 2022 · 5e1cd28 · 5e1cd28
2 parents 3a47436 + e8a1a03
commit 5e1cd28
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ci/images/releasescripts/pom.xml b/ci/images/releasescripts/pom.xml
@@ -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>

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
@@ -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")
 }
diff --git a/...ests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar-unpack-app/build.gradle b/...ests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar-unpack-app/build.gradle
@@ -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 {