Updating dependency versions

gradle.properties

@@ -10,26 +10,26 @@ org.gradle.java.installations.fromEnv=JAVA_HOME,RUNTIME_JAVA_HOME,JAVA15_HOME,JA
 
 ## Dependecies Version
 # Logging
-log4jVersion = 2.17.1
+log4jVersion = 2.17.2
 
 # Hadoop versions
-hadoop3Version  = 3.1.2
-hadoop2Version  = 2.7.6
-hadoop22Version = 2.2.0
+hadoop3Version  = 3.3.2
+hadoop2Version  = 2.10.6
+#hadoop22Version = 2.2.0
 
 # Common libraries
 hiveVersion = 3.1.2
 pigVersion = 0.15.0
 # pig 0.15 depends on Joda but doesn't declare it in its pom
-jodaVersion = 2.9.3
+jodaVersion = 2.10.3
 # note the versions here are tied to the ones in Hadoop distro - 1.8.8
 jacksonVersion = 1.8.8
 
 # Spark
-spark13Version = 1.6.2
-spark20Version = 2.3.0
+spark13Version = 1.6.3
+spark20Version = 2.4.7
 spark22Version = 2.2.3
-spark24Version = 2.4.4
+spark24Version = 2.4.7
 spark30Version = 3.2.1
 
 # same as Spark's
@@ -45,12 +45,12 @@ scala213MajorVersion = 2.13
 stormVersion = 1.0.6
 
 # Testing
-junitVersion = 4.11
-mockitoVersion = 1.8.5
+junitVersion = 4.13.2
+mockitoVersion = 4.3.1
 hamcrestVersion = 1.3
-minikdcVersion = 2.7.7
+minikdcVersion = 3.3.2
 # Hive 0.11 finally updated antlr to 3.4 so there are no more conflicts with Pig
 antlrVersion = 3.4
 thriftVersion = 0.5.0
 
-groovyVersion = 2.4.4
+groovyVersion = 2.5.15

spark/core/build.gradle

@@ -49,16 +49,15 @@ sparkVariants {
             }
 
             add(variant.configuration('implementation'), project(":elasticsearch-hadoop-mr"))
-            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
+            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.2")
 
-            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.module:jackson-module-scala_${variant.scalaMajorVersion}:2.9.10")
-            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
-            add(variant.configuration('compileOnly'), "com.google.guava:guava:14.0.1")
-            add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:2.5.0")
-            add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:1.7.6")
+            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.13.1")
+            add(variant.configuration('compileOnly'), "com.google.guava:guava:31.1-jre")
+            add(variant.configuration('compileOnly'), "com.google.protobuf:protobuf-java:3.19.4")
+            add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:1.7.36")
 
             add(variant.configuration('test', 'implementation'), project(":test:shared"))
-            add(variant.configuration('test', 'implementation'), "com.esotericsoftware.kryo:kryo:2.21")
+            add(variant.configuration('test', 'implementation'), "com.esotericsoftware.kryo:kryo:2.24.0")
             add(variant.configuration('test', 'implementation'), "org.apache.spark:spark-core_${variant.scalaMajorVersion}:${variant.sparkVersion}") {
                 exclude group: 'javax.servlet'
                 exclude group: 'org.apache.hadoop'
@@ -68,19 +67,21 @@ sparkVariants {
             add(variant.configuration('test', 'implementation'), "org.elasticsearch:securemock:1.2")
 
             if (variant.scalaMajorVersion == '2.10') {
+                add(variant.configuration('compileOnly'), "com.fasterxml.jackson.module:jackson-module-scala_${variant.scalaMajorVersion}:2.11.4")
                 add(variant.configuration('implementation'), "org.apache.spark:spark-unsafe_${variant.scalaMajorVersion}:${variant.sparkVersion}")
-                add(variant.configuration('implementation'), "org.apache.avro:avro:1.7.7")
-                add(variant.configuration('implementation'), "log4j:log4j:1.2.17")
-                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:2.0.1")
-                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.2.10")
-                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.21")
+                add(variant.configuration('implementation'), "org.apache.avro:avro:1.11.0")
+                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:3.0.2")
+                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.6.11")
+                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.24.0")
                 add(variant.configuration('compileOnly'), "org.apache.hadoop:hadoop-annotations:${project.ext.hadoopVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
-                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:3.1.4")
+                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:4.2.1")
                 if (variant.sparkVersion == spark22Version) {
                     add(variant.configuration('compileOnly'), "org.apache.spark:spark-tags_${variant.scalaMajorVersion}:${variant.sparkVersion}")
                 }
+            } else {
+                add(variant.configuration('compileOnly'), "com.fasterxml.jackson.module:jackson-module-scala_${variant.scalaMajorVersion}:2.13.1")
             }
 
             add(variant.configuration('additionalSources'), project(":elasticsearch-hadoop-mr"))

spark/sql-13/build.gradle

@@ -70,27 +70,28 @@ sparkVariants {
             add(variant.configuration('implementation'), "org.apache.spark:spark-streaming_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
-            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
+            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.2")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
 
             // Scala compiler needs these for arcane reasons, but they are not used in the api nor the runtime
-            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
-            add(variant.configuration('compileOnly'), "com.google.guava:guava:16.0.1")
-            add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.2.11")
-            add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:1.7.6")
+            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.13.1")
+            add(variant.configuration('compileOnly'), "com.google.guava:guava:31.1-jre")
+            add(variant.configuration('compileOnly'), "org.slf4j:slf4j-api:1.7.36")
 
             if ('2.10'.equals(scalaMajorVersion)) {
                 add(variant.configuration('implementation'), "org.apache.spark:spark-unsafe_${variant.scalaMajorVersion}:$variant.sparkVersion")
-                add(variant.configuration('implementation'), "org.apache.avro:avro:1.7.7")
-                add(variant.configuration('implementation'), "log4j:log4j:1.2.17")
-                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:2.0.1")
-                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.2.10")
-                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.21")
+                add(variant.configuration('implementation'), "org.apache.avro:avro:1.11.0")
+                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:3.0.2")
+                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.6.11")
+                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.24.0")
                 add(variant.configuration('compileOnly'), "org.apache.hadoop:hadoop-annotations:${project.ext.hadoopVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
-                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:3.1.4")
+                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:4.2.1")
+                add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.6.12")
+            } else {
+                add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:4.0.4")
             }
 
             add(variant.configuration('test', 'implementation'), project(":test:shared"))

spark/sql-20/build.gradle

@@ -66,35 +66,36 @@ sparkVariants {
             add(variant.configuration('implementation'), "org.apache.spark:spark-streaming_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
-            add(variant.configuration('implementation'), "org.slf4j:slf4j-api:1.7.6") {
+            add(variant.configuration('implementation'), "org.slf4j:slf4j-api:1.7.36") {
                 because 'spark exposes slf4j components in traits that we need to extend'
             }
-            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
+            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.2")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
-            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
+            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:3.19.4")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
             add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
 
             // Scala compiler needs these for arcane reasons, but they are not used in the api nor the runtime
-            add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.0.0")
-            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
-            add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.2.11")
+            add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1")
+            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.13.1")
             add(variant.configuration('compileOnly'), "org.apache.spark:spark-tags_${variant.scalaMajorVersion}:$variant.sparkVersion")
 
             if ('2.10' == scalaMajorVersion) {
                 add(variant.configuration('implementation'), "org.apache.spark:spark-unsafe_${variant.scalaMajorVersion}:$variant.sparkVersion")
-                add(variant.configuration('implementation'), "org.apache.avro:avro:1.7.7")
-                add(variant.configuration('implementation'), "log4j:log4j:1.2.17")
-                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:2.0.1")
-                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.2.10")
-                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.21")
+                add(variant.configuration('implementation'), "org.apache.avro:avro:1.11.0")
+                add(variant.configuration('implementation'), "com.google.code.findbugs:jsr305:3.0.2")
+                add(variant.configuration('implementation'), "org.json4s:json4s-ast_2.10:3.6.11")
+                add(variant.configuration('implementation'), "com.esotericsoftware.kryo:kryo:2.24.0")
                 add(variant.configuration('compileOnly'), "org.apache.hadoop:hadoop-annotations:${project.ext.hadoopVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-core-asl:${project.ext.jacksonVersion}")
                 add(variant.configuration('compileOnly'), "org.codehaus.jackson:jackson-mapper-asl:${project.ext.jacksonVersion}")
-                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:3.1.4")
-                add(variant.configuration('compileOnly'), "org.apache.htrace:htrace-core4:4.1.0-incubating")
+                add(variant.configuration('compileOnly'), "org.codehaus.woodstox:stax2-api:4.2.1")
+                add(variant.configuration('compileOnly'), "org.apache.htrace:htrace-core4:4.2.0-incubating")
+                add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.6.12")
+            } else {
+                add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:4.0.4")
             }
 
             add(variant.configuration('test', 'implementation'), project(":test:shared"))

spark/sql-30/build.gradle

@@ -65,26 +65,26 @@ sparkVariants {
             add(variant.configuration('implementation'), "org.apache.spark:spark-streaming_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
-            add(variant.configuration('implementation'), "org.slf4j:slf4j-api:1.7.6") {
+            add(variant.configuration('implementation'), "org.slf4j:slf4j-api:1.7.36") {
                 because 'spark exposes slf4j components in traits that we need to extend'
             }
-            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.1.1")
+            add(variant.configuration('implementation'), "commons-logging:commons-logging:1.2")
             add(variant.configuration('implementation'), "javax.xml.bind:jaxb-api:2.3.1")
-            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:2.5.0")
+            add(variant.configuration('implementation'), "com.google.protobuf:protobuf-java:3.19.4")
             add(variant.configuration('implementation'), "org.apache.spark:spark-catalyst_${variant.scalaMajorVersion}:$variant.sparkVersion")
             add(variant.configuration('implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }
 
             // Scala compiler needs these for arcane reasons, but they are not used in the api nor the runtime
-            add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.0.0")
-            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.6.7")
-            add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:3.6.6")
-            add(variant.configuration('compileOnly'), "org.json4s:json4s-ast_${variant.scalaMajorVersion}:3.6.6")
+            add(variant.configuration('compileOnly'), "org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1")
+            add(variant.configuration('compileOnly'), "com.fasterxml.jackson.core:jackson-annotations:2.13.1")
+            add(variant.configuration('compileOnly'), "org.json4s:json4s-jackson_${variant.scalaMajorVersion}:4.0.4")
+            add(variant.configuration('compileOnly'), "org.json4s:json4s-ast_${variant.scalaMajorVersion}:4.0.4")
             add(variant.configuration('compileOnly'), "org.apache.spark:spark-tags_${variant.scalaMajorVersion}:$variant.sparkVersion")
 
             add(variant.configuration('test', 'implementation'), project(":test:shared"))
-            add(variant.configuration('test', 'implementation'), "jakarta.servlet:jakarta.servlet-api:4.0.3")
+            add(variant.configuration('test', 'implementation'), "jakarta.servlet:jakarta.servlet-api:5.0.0")
             add(variant.configuration('test', 'implementation'), "org.elasticsearch:securemock:1.2")
             add(variant.configuration('test', 'implementation'), "org.apache.spark:spark-core_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'javax.servlet'
@@ -95,7 +95,7 @@ sparkVariants {
             }
 
             add(variant.configuration('itest', 'implementation'), project(":test:shared"))
-            add(variant.configuration('itest', 'implementation'), "jakarta.servlet:jakarta.servlet-api:4.0.3")
+            add(variant.configuration('itest', 'implementation'), "jakarta.servlet:jakarta.servlet-api:5.0.0")
             add(variant.configuration('itest', 'implementation'), "org.apache.spark:spark-yarn_${variant.scalaMajorVersion}:$variant.sparkVersion") {
                 exclude group: 'org.apache.hadoop'
             }