Upgrade gradle to 8.4 (#596)

* Upgrade gradle to 8.4 Signed-off-by: Ryan Bogan <[email protected]> * Add Changelog entry Signed-off-by: Ryan Bogan <[email protected]> * Add required explicit dependency Signed-off-by: Ryan Bogan <[email protected]> * Add second required explicit dependency Signed-off-by: Ryan Bogan <[email protected]> --------- Signed-off-by: Ryan Bogan <[email protected]>
opensearch-project · Dec 21, 2023 · 70f6751 · 70f6751
1 parent 3305da1
commit 70f6751
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -203,6 +203,7 @@ private Processor.Parameters getProcessorParameter() {
             null,
             ingestService,
             client,
+            null,
             null
         );
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,4 +72,5 @@ publishing { @@
         }
     }
+    validatePluginZipPom.dependsOn(generatePomFileForNebulaPublication)
+    validateNebulaPom.dependsOn(generatePomFileForPluginZipPublication)