Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Closes gh-40624
This commit is contained in:
Moritz Halbritter 2024-05-06 09:50:20 +02:00
commit c47cdda824
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-signed.gradle
View File

@ -13,5 +13,5 @@ repositories {
} }
dependencies { dependencies {
implementation("org.bouncycastle:bcprov-jdk18on:1.76") implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
} }

4
spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle
View File

@ -18,6 +18,6 @@ dependencies {
testImplementation("org.springframework:spring-core-test") testImplementation("org.springframework:spring-core-test")
testRuntimeOnly("ch.qos.logback:logback-classic") 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") testRuntimeOnly("org.springframework:spring-webmvc")
} }

4
spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
View File

@ -18,6 +18,6 @@ dependencies {
testImplementation("org.springframework:spring-core-test") testImplementation("org.springframework:spring-core-test")
testRuntimeOnly("ch.qos.logback:logback-classic") 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") testRuntimeOnly("org.springframework:spring-webmvc")
} }

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-signed/pom.xml
View File

@ -56,7 +56,7 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId> <artifactId>bcprov-jdk18on</artifactId>
<version>1.76</version> <version>1.78.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@ -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-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-web", configuration: "mavenRepository")
app project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter", 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(enforcedPlatform(project(":spring-boot-project:spring-boot-parent")))
intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support")) intTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle
View File

@ -16,7 +16,7 @@ repositories {
dependencies { dependencies {
implementation("org.springframework.boot:spring-boot-starter") 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) { tasks.register("bootJarUnpack", BootJar.class) {
@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {
targetJavaVersion = targetCompatibility targetJavaVersion = targetCompatibility
} }
build.dependsOn bootJarUnpack build.dependsOn bootJarUnpack