From 181023c0c3b8503d82422a6c1ade96b82ccf49a2 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 16 Jun 2022 03:21:41 +0200 Subject: [PATCH 1/2] Update to Bouncycastle 1.71 Closes gh-28636 --- build.gradle | 2 +- spring-web/spring-web.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 98ea74a895..35bf707447 100644 --- a/build.gradle +++ b/build.gradle @@ -218,7 +218,7 @@ configure(allprojects) { project -> } dependency "org.skyscreamer:jsonassert:1.5.0" dependency "com.jayway.jsonpath:json-path:2.6.0" - dependency "org.bouncycastle:bcpkix-jdk15on:1.66" + dependency "org.bouncycastle:bcpkix-jdk18on:1.71" dependencySet(group: 'org.apache.tiles', version: '3.0.8') { entry 'tiles-api' diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle index 716ecb4cec..1b331f7d1f 100644 --- a/spring-web/spring-web.gradle +++ b/spring-web/spring-web.gradle @@ -87,7 +87,7 @@ dependencies { testFixturesImplementation("io.projectreactor:reactor-test") testFixturesImplementation("org.apache.taglibs:taglibs-standard-jstlel") testFixturesImplementation("org.assertj:assertj-core") - testFixturesImplementation("org.bouncycastle:bcpkix-jdk15on") { + testFixturesImplementation("org.bouncycastle:bcpkix-jdk18on") { because("needed by Netty's SelfSignedCertificate on JDK 15+") } } From bdf91ac435a419b431ad67417d3e63ac5b5c2466 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 16 Jun 2022 16:13:26 +0200 Subject: [PATCH 2/2] Set default encoding for Eclipse projects to UTF-8 This change aligns with Java 18 support in recent versions of Eclipse. --- gradle/ide.gradle | 2 ++ src/eclipse/org.eclipse.core.resources.prefs | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 src/eclipse/org.eclipse.core.resources.prefs diff --git a/gradle/ide.gradle b/gradle/ide.gradle index d5215f2875..fc3d07afc7 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -72,6 +72,7 @@ eclipse.classpath.file.whenMerged { // Include project specific settings task eclipseSettings(type: Copy) { from rootProject.files( + 'src/eclipse/org.eclipse.core.resources.prefs', 'src/eclipse/org.eclipse.jdt.core.prefs', 'src/eclipse/org.eclipse.jdt.ui.prefs') into project.file('.settings/') @@ -79,6 +80,7 @@ task eclipseSettings(type: Copy) { } task cleanEclipseSettings(type: Delete) { + delete project.file('.settings/org.eclipse.core.resources.prefs') delete project.file('.settings/org.eclipse.jdt.core.prefs') delete project.file('.settings/org.eclipse.jdt.ui.prefs') } diff --git a/src/eclipse/org.eclipse.core.resources.prefs b/src/eclipse/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/src/eclipse/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8