Upgrade to Gradle 6.4 (#1471)

Update build scripts for Gradle 6.4

Author: jbaiera

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 

gradlew.bat

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 import org.elasticsearch.gradle.test.AntFixture
 import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask
 import org.elasticsearch.hadoop.gradle.fixture.hadoop.HadoopFixturePlugin
@@ -48,6 +47,21 @@ tasks.withType(ScalaCompile) { ScalaCompile task ->
 
 boolean localRepo = project.getProperties().containsKey("localRepo")
 
+// Gradle's java library plugin adds a variant to each project that offers the classes dir as an artifact that can be 
+// used in other projects instead of requiring a jar operation to happen. Kerberos depends on the spark integration to 
+// compile some code, but due to how the current spark compilation works it's likely that the classes directory in the 
+// spark projects do not exist anymore when the kerberos compilation happens during a distribution build.
+// TODO: Clean this up when we get to variants, they should persist their classes dirs in a sane way
+configurations {
+    compileClasspath {
+        beforeLocking {
+            attributes {
+                attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements, LibraryElements.JAR))
+            }
+        }
+    }
+}
+
 dependencies {
     implementation(project(":elasticsearch-hadoop-mr"))
     implementation(project(":elasticsearch-storm"))

qa/kerberos/build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'scala.variants'
 
 variants {
     defaultVersion '2.11.12'
-    targetVersions '2.11.12'
+    targetVersions '2.10.7', '2.11.12'
 }
 
 println "Compiled using Scala ${project.ext.scalaMajorVersion} [${project.ext.scalaVersion}]"
@@ -58,6 +58,7 @@ tasks.withType(ScalaCompile) { ScalaCompile task ->
 }
 
 compileScala {
+    options.forkOptions.executable = new File(project.ext.runtimeJavaHome, 'bin/java').canonicalPath
     configure(scalaCompileOptions.forkOptions) {
         memoryMaximumSize = '1g'
         jvmArgs = ['-XX:MaxPermSize=512m']
@@ -148,6 +149,9 @@ dependencies {
         implementation("com.google.code.findbugs:jsr305:2.0.1")
         implementation("org.json4s:json4s-ast_2.10:3.2.10")
         implementation("com.esotericsoftware.kryo:kryo:2.21")
+        compileOnly("org.apache.hadoop:hadoop-annotations:${project.ext.hadoopVersion}")
+        compileOnly("org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
+        compileOnly("org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
     }
 
     testImplementation(project(":test:shared"))

spark/sql-13/build.gradle

@@ -10,7 +10,7 @@ apply plugin: 'scala.variants'
 
 variants {
     defaultVersion '2.11.12'
-    targetVersions '2.11.12'
+    targetVersions '2.10.7', '2.11.12'
 }
 
 configurations {
@@ -44,6 +44,7 @@ tasks.withType(ScalaCompile) { ScalaCompile task ->
 }
 
 compileScala {
+    options.forkOptions.executable = new File(project.ext.runtimeJavaHome, 'bin/java').canonicalPath
     configure(scalaCompileOptions.forkOptions) {
         memoryMaximumSize = '1g'
         jvmArgs = ['-XX:MaxPermSize=512m']
@@ -139,6 +140,9 @@ dependencies {
         implementation("com.google.code.findbugs:jsr305:2.0.1")
         implementation("org.json4s:json4s-ast_2.10:3.2.10")
         implementation("com.esotericsoftware.kryo:kryo:2.21")
+        compileOnly("org.apache.hadoop:hadoop-annotations:${project.ext.hadoopVersion}")
+        compileOnly("org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
+        compileOnly("org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
     }
 
     testImplementation(project(":test:shared"))