Skip to content

Commit c47cdda

Browse files
committed
Merge branch '3.1.x' into 3.2.x
Closes gh-40624
2 parents 8a72e55 + d18fb9c commit c47cdda

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

Diff for: spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-signed.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ repositories {
1313
}
1414

1515
dependencies {
16-
implementation("org.bouncycastle:bcprov-jdk18on:1.76")
16+
implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
1717
}

Diff for: spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies {
1818
testImplementation("org.springframework:spring-core-test")
1919

2020
testRuntimeOnly("ch.qos.logback:logback-classic")
21-
testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.71")
21+
testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.78.1")
2222
testRuntimeOnly("org.springframework:spring-webmvc")
23-
}
23+
}

Diff for: spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ dependencies {
1818
testImplementation("org.springframework:spring-core-test")
1919

2020
testRuntimeOnly("ch.qos.logback:logback-classic")
21-
testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.71")
21+
testRuntimeOnly("org.bouncycastle:bcprov-jdk18on:1.78.1")
2222
testRuntimeOnly("org.springframework:spring-webmvc")
23-
}
23+
}

Diff for: spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-signed/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.bouncycastle</groupId>
5858
<artifactId>bcprov-jdk18on</artifactId>
59-
<version>1.76</version>
59+
<version>1.78.1</version>
6060
</dependency>
6161
</dependencies>
6262
</project>

Diff for: spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies {
1919
app project(path: ":spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin", configuration: "mavenRepository")
2020
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-web", configuration: "mavenRepository")
2121
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", configuration: "mavenRepository")
22-
app("org.bouncycastle:bcprov-jdk18on:1.76")
22+
app("org.bouncycastle:bcprov-jdk18on:1.78.1")
2323

2424
intTestImplementation(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
2525
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

Diff for: spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616

1717
dependencies {
1818
implementation("org.springframework.boot:spring-boot-starter")
19-
implementation("org.bouncycastle:bcprov-jdk18on:1.76")
19+
implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
2020
}
2121

2222
tasks.register("bootJarUnpack", BootJar.class) {
@@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {
2727
targetJavaVersion = targetCompatibility
2828
}
2929

30-
build.dependsOn bootJarUnpack
30+
build.dependsOn bootJarUnpack

0 commit comments

Comments
 (0)