Browse Source

Merge branch '3.1.x' into 3.2.x

Closes gh-40624
pull/41000/head
Moritz Halbritter 2 years ago
parent
commit
c47cdda824
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/tasks/bundling/BootJarIntegrationTests-signed.gradle
  2. 4
      spring-boot-project/spring-boot-tools/spring-boot-loader-classic/build.gradle
  3. 4
      spring-boot-project/spring-boot-tools/spring-boot-loader/build.gradle
  4. 2
      spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/intTest/projects/jar-signed/pom.xml
  5. 2
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
  6. 4
      spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/spring-boot-loader-tests-signed-jar/build.gradle

2
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 { @@ -13,5 +13,5 @@ repositories {
}
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

@ -18,6 +18,6 @@ dependencies { @@ -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")
}
}

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

@ -18,6 +18,6 @@ dependencies { @@ -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")
}
}

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

@ -56,7 +56,7 @@ @@ -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>

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

@ -19,7 +19,7 @@ dependencies { @@ -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"))

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

@ -16,7 +16,7 @@ repositories { @@ -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) { @@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {
targetJavaVersion = targetCompatibility
}
build.dependsOn bootJarUnpack
build.dependsOn bootJarUnpack

Loading…
Cancel
Save