From 70f67518cd4afc61970107f97e7f5207caddc607 Mon Sep 17 00:00:00 2001 From: Ryan Bogan Date: Wed, 20 Dec 2023 19:37:01 -0800 Subject: [PATCH] Upgrade gradle to 8.4 (#596) * Upgrade gradle to 8.4 Signed-off-by: Ryan Bogan * Add Changelog entry Signed-off-by: Ryan Bogan * Add required explicit dependency Signed-off-by: Ryan Bogan * Add second required explicit dependency Signed-off-by: Ryan Bogan --------- Signed-off-by: Ryan Bogan --- CHANGELOG.md | 1 + build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- libs/h3/build.gradle | 3 ++- .../opensearch/geospatial/plugin/GeospatialPluginTests.java | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f692af4..2cdb3c0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,4 +21,5 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho ### Infrastructure ### Documentation ### Maintenance +* Upgrade gradle to 8.4 ([#596](https://github.com/opensearch-project/geospatial/pull/596)) ### Refactoring diff --git a/build.gradle b/build.gradle index 03aad979..31468f74 100644 --- a/build.gradle +++ b/build.gradle @@ -75,7 +75,7 @@ buildscript { dependencies { classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}" classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0" - classpath "io.freefair.gradle:lombok-plugin:6.4.3" + classpath "io.freefair.gradle:lombok-plugin:8.4" } } apply plugin: "com.diffplug.spotless" @@ -315,8 +315,8 @@ spotless { jacocoTestReport { dependsOn test reports { - xml.enabled = true - html.enabled = true + xml.getRequired().set(true) + html.getRequired().set(true) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702..e411586a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/h3/build.gradle b/libs/h3/build.gradle index 061f3e21..c0ff95e4 100644 --- a/libs/h3/build.gradle +++ b/libs/h3/build.gradle @@ -72,4 +72,5 @@ publishing { } } - +validatePluginZipPom.dependsOn(generatePomFileForNebulaPublication) +validateNebulaPom.dependsOn(generatePomFileForPluginZipPublication) diff --git a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginTests.java b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginTests.java index 48b23197..5bfb489d 100644 --- a/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginTests.java +++ b/src/test/java/org/opensearch/geospatial/plugin/GeospatialPluginTests.java @@ -203,6 +203,7 @@ private Processor.Parameters getProcessorParameter() { null, ingestService, client, + null, null ); }