Skip to content

Commit

Permalink
Merge branch '3.1.x' into 3.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mhalbritter committed May 6, 2024
2 parents 8a72e55 + d18fb9c commit c47cdda
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ repositories {
}

dependencies {
implementation("org.bouncycastle:bcprov-jdk18on:1.76")
implementation("org.bouncycastle:bcprov-jdk18on:1.78.1")
}
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -27,4 +27,4 @@ tasks.register("bootJarUnpack", BootJar.class) {
targetJavaVersion = targetCompatibility
}

build.dependsOn bootJarUnpack
build.dependsOn bootJarUnpack

0 comments on commit c47cdda

Please sign in to comment.