Upgrade to gradle 8.4

build.gradle

@@ -24,7 +24,7 @@ buildscript {
     //noinspection GroovyAssignabilityCheck
     dependencies {
         classpath 'org.ow2.asm:asm:5.1'
-        classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0'
+        classpath 'com.github.johnrengelman:shadow:8.1.1'
         classpath 'org.gradle.api.plugins:gradle-nexus-plugin:0.7.1'
         classpath 'org.testng:testng:6.8'
         classpath 'me.champeau.gradle:jmh-gradle-plugin:0.5.2'

gradle/copyJars.gradle

@@ -3,14 +3,14 @@
 tasks.withType(Jar) { Jar t ->
   t.doLast {
     copy {
-      from t.archivePath
-      into t.destinationDir
+      from t.archiveFile
+      into t.destinationDirectory
       // Here we expected standard JAR file archive name:
       //    [baseName]-[appendix]-[version]-[classifier].[extension]
-      if (t.classifier!=null) {
-          rename("(.*)-${t.version}(.*)", '$1$2')
+      if (t.archiveClassifier!=null) {
+          rename("(.*)-${t.archiveVersion.get()}(.*)", '$1$2')
       } else {
-          rename("(.*)${t.version}-?(.*)", '$1$2')
+          rename("(.*)${t.archiveVersion.get()}-?(.*)", '$1$2')
       }
     }
   }

gradle/java.gradle

@@ -11,7 +11,7 @@ compileJava {
 }
 
 task testJar(type: Jar, dependsOn: testClasses, group: "build") {
-    classifier = 'test'
+    archiveClassifier.set('test')
     from sourceSets.test.output
 }
 

gradle/javaIgnoreSymbolFile.gradle

@@ -2,5 +2,5 @@ compileJava {
     // This only works when forking and passing 'javac' as an executable
     options.compilerArgs << '-XDignore.symbol.file'    
     options.fork = true
-    options.forkOptions.executable = 'javac'
+    options.forkOptions.executable = "${System.properties['java.home']}/../bin/javac"
 }

gradle/publish.gradle

@@ -4,7 +4,7 @@ apply plugin: 'signing'
 
 // Default task to bundle sources code as jar
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 

gradle/ubench.gradle

@@ -76,7 +76,7 @@ task jmhPostProcess(dependsOn: "jmh") {
 }
 
 task jmhFatJar(type: ShadowJar) {
-    classifier = "jmh"
+    archiveClassifier.set('jmh')
     manifest {
         attributes "Main-Class": "org.openjdk.jmh.Main"
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

h2o-assemblies/genmodel/build.gradle

@@ -35,7 +35,7 @@ for (comp in optionalComponents) {
 
 shadowJar {
   mergeServiceFiles()
-  classifier = ''
+  archiveClassifier.set('')
   relocate 'com.google.gson', 'ai.h2o.com.google.gson' // Should be eventually removed: https://github.com/h2oai/h2o-3/issues/12372
   relocate 'org.apache.commons.text', 'ai.h2o.org.apache.commons.text'
   relocate 'org.apache.commons.lang3', 'ai.h2o.org.apache.commons.lang3'

h2o-assemblies/main/build.gradle

@@ -92,7 +92,7 @@ dependencies {
 shadowJar {
   zip64 true
   mergeServiceFiles()
-  classifier = ''
+  archiveClassifier.set('')
   // CDH 5.3.0 provides joda-time v1.6 which is too old, shadow the library instead
   if (!project.hasProperty("jacocoCoverage")) {
     relocate 'org.joda.time', 'ai.h2o.org.joda.time'

h2o-assemblies/minimal/build.gradle

@@ -33,7 +33,7 @@ dependencies {
 
 shadowJar {
   mergeServiceFiles()
-  classifier = ''
+  archiveClassifier.set('')
   exclude 'META-INF/*.DSA'
   exclude 'META-INF/*.SF'
   exclude 'synchronize.properties'

h2o-assemblies/steam/build.gradle

@@ -89,7 +89,7 @@ dependencies {
 
 shadowJar {
   mergeServiceFiles()
-  classifier = ''
+  archiveClassifier.set('')
   exclude 'META-INF/*.DSA'
   exclude 'META-INF/*.SF'
   exclude 'synchronize.properties'

h2o-hadoop-2/assemblyjar.gradle

@@ -127,8 +127,8 @@ shadowJar {
   relocate 'org.apache.http', 'ai.h2o.org.apache.http'
   exclude hadoopShadowJarExcludes
   relocate 'com.google.common', 'ai.h2o.com.google.common'
-  baseName = 'h2odriver'
-  classifier = ''
+  archiveBaseName.set('h2odriver')
+  archiveClassifier.set('')
   manifest {
     attributes 'Main-Class': 'water.hadoop.h2odriver'
   }

h2o-hadoop-3/assemblyjar_common.gradle

@@ -90,8 +90,8 @@ shadowJar {
     exclude hadoopShadowJarExcludes
     relocate 'com.google.common', 'ai.h2o.com.google.common'
     relocate 'org.eclipse.jetty', 'ai.h2o.org.eclipse.jetty'
-    baseName = 'h2odriver'
-    classifier = ''
+    archiveBaseName.set('h2odriver')
+    archiveClassifier.set('')
     manifest {
         attributes 'Main-Class': 'water.hadoop.h2odriver'
     }

h2o-k8s-comp/build.gradle

@@ -19,7 +19,7 @@ dependencies {
 
 shadowJar {
     mergeServiceFiles()
-    classifier = ''
+    archiveClassifier.set('')
     exclude 'META-INF/*.DSA'
     exclude 'META-INF/*.SF'
     exclude 'synchronize.properties'

h2o-py-cloud-extensions/build.gradle

@@ -84,5 +84,6 @@ task cleanBuild(type: Delete) {
 //
 // Define the dependencies
 //
+jar.dependsOn copySrcFiles
 clean.dependsOn cleanBuild, cleanUpTestResults
 build.dependsOn copyMainDist

h2o-py-mlflow-flavor/build.gradle

@@ -59,5 +59,6 @@ task cleanBuild(type: Delete) {
 //
 // Define the dependencies
 //
+jar.dependsOn copySrcFiles
 clean.dependsOn cleanBuild
 build.dependsOn copyMainDist