Updating scala, spark, and hadoop to supported versions (#2215)

Author: masseyke

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/BuildPlugin.groovy

@@ -281,7 +281,6 @@ class BuildPlugin implements Plugin<Project>  {
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "junit:junit:${project.ext.junitVersion}")
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.hamcrest:hamcrest-all:${project.ext.hamcrestVersion}")
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "joda-time:joda-time:2.8")
-            add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.slf4j:slf4j-log4j12:1.7.6")
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.apache.logging.log4j:log4j-api:${project.ext.log4jVersion}")
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.apache.logging.log4j:log4j-core:${project.ext.log4jVersion}")
             add(SHARED_TEST_IMPLEMENTATION_CONFIGURATION_NAME, "org.apache.logging.log4j:log4j-1.2-api:${project.ext.log4jVersion}")
@@ -308,14 +307,6 @@ class BuildPlugin implements Plugin<Project>  {
                 resolve.force("commons-cli:commons-cli:1.2")
 
                 resolve.eachDependency { DependencyResolveDetails details ->
-                    // There are tons of slf4j-* variants. Search for all of them, and lock them down.
-                    if (details.requested.name.contains("slf4j-")) {
-                        // Some projects make use of the slf4j binding libraries that are from the implementation side,
-                        // so these must be left alone.
-                        if (details.requested.group.equals("org.apache.logging.log4j") == false) {
-                            details.useVersion "1.7.6"
-                        }
-                    }
                     // Be careful with log4j version settings as they can be easily missed.
                     if (details.requested.name.contains("org.apache.logging.log4j") && details.requested.name.contains("log4j-")) {
                         details.useVersion project.ext.log4jVersion

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/services/HadoopServiceDescriptor.groovy

@@ -62,7 +62,7 @@ class HadoopServiceDescriptor implements ServiceDescriptor {
 
     @Override
     Version defaultVersion() {
-        return new Version(3, 3, 2)
+        return new Version(3, 4, 0)
     }
 
     @Override

buildSrc/src/main/groovy/org/elasticsearch/hadoop/gradle/fixture/hadoop/services/SparkYarnServiceDescriptor.groovy

@@ -56,7 +56,7 @@ class SparkYarnServiceDescriptor implements ServiceDescriptor {
 
     @Override
     Version defaultVersion() {
-        return new Version(3, 3, 3)
+        return new Version(3, 4, 2)
     }
 
     String hadoopVersionCompatibility() {

gradle.properties

@@ -11,6 +11,7 @@ org.gradle.java.installations.fromEnv=JAVA_HOME,RUNTIME_JAVA_HOME,JAVA15_HOME,JA
 
 ## Dependecies Version
 # Logging
+slf4jVersion = 2.0.6
 log4jVersion = 2.17.1
 
 # Hadoop versions
@@ -28,16 +29,16 @@ spark13Version = 1.6.2
 spark20Version = 2.3.0
 spark22Version = 2.2.3
 spark24Version = 2.4.4
-spark30Version = 3.3.3
+spark30Version = 3.4.2
 
 # same as Spark's
 scala210Version = 2.10.7
 scala210MajorVersion = 2.10
 scala211Version = 2.11.12
 scala211MajorVersion = 2.11
-scala212Version = 2.12.8
+scala212Version = 2.12.19
 scala212MajorVersion = 2.12
-scala213Version = 2.13.6
+scala213Version = 2.13.13
 scala213MajorVersion = 2.13
 
 # Testing

licenses/scala-library-2.12.19.jar.sha1

@@ -0,0 +1 @@
+719d843f28afd3239726b7aab9c5c9171aae1d80

licenses/scala-library-2.12.8.jar.sha1

@@ -0,0 +1 @@
+76c5600f371936a8c8fed925cb76791e212d3715

licenses/scala-reflect-2.12.19.jar.sha1

@@ -0,0 +1 @@
+88c40d8b4f33326f19a7d3c0aaf2c7e8721d4953