Merge branch '2.7.x'

Closes gh-31403
This commit is contained in:
Andy Wilkinson 2022-06-16 12:14:52 +01:00
commit d370d19e7a
3 changed files with 4 additions and 4 deletions

View File

@ -21,8 +21,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk15to18</artifactId> <artifactId>bcpg-jdk18on</artifactId>
<version>1.68</version> <version>1.71</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

View File

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

View File

@ -14,7 +14,7 @@ repositories {
dependencies { dependencies {
implementation("org.springframework.boot:spring-boot-starter") implementation("org.springframework.boot:spring-boot-starter")
implementation("org.bouncycastle:bcprov-jdk15on:1.70") implementation("org.bouncycastle:bcprov-jdk18on:1.71")
} }
bootJar { bootJar {