Merge branch '3.1.x' into 3.2.x

mhalbritter · mhalbritter · commit c47cdda82469 · 2024-05-06T09:51:39.000+02:00
Closes gh-40624
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-signed.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-signed.gradle
@@ -13,5 +13,5 @@ repositories {
 }
 
 dependencies {
-	implementation("org.bouncycastle:bcprov-jdk18on:1.76")
+	implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
 }
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle
@@ -18,6 +18,6 @@ dependencies {
 	testImplementation("org.springframework:spring-core-test")
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
-	testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.71")
+	testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.78.1")
 	testRuntimeOnly("org.springframework:spring-webmvc")
-}
+}
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
@@ -18,6 +18,6 @@ dependencies {
 	testImplementation("org.springframework:spring-core-test")
 
 	testRuntimeOnly("ch.qos.logback:logback-classic")
-	testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.71")
+	testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.78.1")
 	testRuntimeOnly("org.springframework:spring-webmvc")
-}
+}
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-signed/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-signed/pom.xml
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk18on</artifactId>
-			<version>1.76</version>
+			<version>1.78.1</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
@@ -19,7 +19,7 @@ dependencies {
 	app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
 	app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
 	app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
-	app("org.bouncycastle:bcprov-jdk18on:1.76")
+	app("org.bouncycastle:bcprov-jdk18on:1.78.1")
 
 	intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
 	intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle
@@ -16,7 +16,7 @@ repositories {
 
 dependencies {
 	implementation("org.springframework.boot:spring-boot-starter")
-	implementation("org.bouncycastle:bcprov-jdk18on:1.76")
+	implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
 }
 
 tasks.register("bootJarUnpack", BootJar.class) {
@@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {
 	targetJavaVersion = targetCompatibility
 }
 
-build.dependsOn bootJarUnpack
+build.dependsOn bootJarUnpack

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ repositories {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- implementation("org.bouncycastle:bcprov-jdk18on:1.76")`
	`16`	`+ implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ repositories {`
`16`	`16`
`17`	`17`	`dependencies {`
`18`	`18`	`implementation("org.springframework.boot:spring-boot-starter")`
`19`		`- implementation("org.bouncycastle:bcprov-jdk18on:1.76")`
	`19`	`+ implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`tasks.register("bootJarUnpack", BootJar.class) {`
`@@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {`
`27`	`27`	`targetJavaVersion = targetCompatibility`
`28`	`28`	`}`
`29`	`29`
`30`		`-build.dependsOn bootJarUnpack`
	`30`	`+build.dependsOn bootJarUnpack`