From d4011e372bc038502644d4347ad315cc8cab3874 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Mon, 5 Feb 2024 12:06:38 -0800 Subject: [PATCH 1/4] Update spotless and eclipse dependencies Signed-off-by: Ryan Bogan --- build.gradle | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2043aaaa..a6da283c 100644 --- a/build.gradle +++ b/build.gradle @@ -74,8 +74,14 @@ buildscript { dependencies { classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}" - classpath "com.diffplug.spotless:spotless-plugin-gradle:6.20.0" + classpath "com.diffplug.spotless:spotless-plugin-gradle:6.25.0" classpath "io.freefair.gradle:lombok-plugin:8.4" + + configurations.all { + resolutionStrategy { + force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29 + } + } } } apply plugin: "com.diffplug.spotless" From 29dcfcaa68bed459c4964aed57441efa371aef8e Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Mon, 5 Feb 2024 12:14:33 -0800 Subject: [PATCH 2/4] Add changelog Signed-off-by: Ryan Bogan --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cdb3c0e..7514e44c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,4 +22,5 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho ### Documentation ### Maintenance * Upgrade gradle to 8.4 ([#596](https://github.com/opensearch-project/geospatial/pull/596)) +* Update spotless and eclipse dependencies ([#620](https://github.com/opensearch-project/geospatial/pull/620)) ### Refactoring From 639e32f4b6768fcb33246d01faa0b4f53853c4a3 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Mon, 5 Feb 2024 12:44:09 -0800 Subject: [PATCH 3/4] Add resources force resolution Signed-off-by: Ryan Bogan --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index a6da283c..e798cf22 100644 --- a/build.gradle +++ b/build.gradle @@ -80,6 +80,7 @@ buildscript { configurations.all { resolutionStrategy { force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29 + force("org.eclipse.platform:org.eclipse.core.resources:4.29.0") // CVE for < 4.29 } } } From 92f96e76ce47791be59c6820b141043c53512365 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Mon, 5 Feb 2024 14:22:00 -0800 Subject: [PATCH 4/4] Use latest resources version Signed-off-by: Ryan Bogan --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e798cf22..8618bed2 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ buildscript { configurations.all { resolutionStrategy { force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29 - force("org.eclipse.platform:org.eclipse.core.resources:4.29.0") // CVE for < 4.29 + force("org.eclipse.platform:org.eclipse.core.resources:4.20.0") // CVE for < 4.20 } } }