Upgrade gradle to 8.4 (#596) (#597)

opensearch-trigger-bot[bot] · ryanbogan · web-flow · commit eb19fb023fbf · 2023-12-26T09:58:32.000-08:00
* Upgrade gradle to 8.4 Signed-off-by: Ryan Bogan <rbogan@amazon.com> * Add Changelog entry Signed-off-by: Ryan Bogan <rbogan@amazon.com> * Add required explicit dependency Signed-off-by: Ryan Bogan <rbogan@amazon.com> * Add second required explicit dependency Signed-off-by: Ryan Bogan <rbogan@amazon.com> --------- Signed-off-by: Ryan Bogan <rbogan@amazon.com> (cherry picked from commit 70f6751) Co-authored-by: Ryan Bogan <rbogan@amazon.com>
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)

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ buildscript {`
`75`	`75`	`dependencies {`
`76`	`76`	`classpath "${opensearch_group}.gradle:build-tools:${opensearch_version}"`
`77`	`77`	`classpath "com.diffplug.spotless:spotless-plugin-gradle:6.3.0"`
`78`		`- classpath "io.freefair.gradle:lombok-plugin:6.4.3"`
	`78`	`+ classpath "io.freefair.gradle:lombok-plugin:8.4"`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`apply plugin: "com.diffplug.spotless"`
`@@ -315,8 +315,8 @@ spotless {`
`315`	`315`	`jacocoTestReport {`
`316`	`316`	`dependsOn test`
`317`	`317`	`reports {`
`318`		`- xml.enabled = true`
`319`		`- html.enabled = true`
	`318`	`+ xml.getRequired().set(true)`
	`319`	`+ html.getRequired().set(true)`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,5 @@ publishing {`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-`
	`75`	`+validatePluginZipPom.dependsOn(generatePomFileForNebulaPublication)`
	`76`	`+validateNebulaPom.dependsOn(generatePomFileForPluginZipPublication)`