diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3 index 566f7c9a3eac..d182f39f8824 100644 --- a/dev/deps/spark-deps-hadoop-3-hive-2.3 +++ b/dev/deps/spark-deps-hadoop-3-hive-2.3 @@ -24,7 +24,7 @@ audience-annotations/0.5.0//audience-annotations-0.5.0.jar avro-ipc/1.11.2//avro-ipc-1.11.2.jar avro-mapred/1.11.2//avro-mapred-1.11.2.jar avro/1.11.2//avro-1.11.2.jar -aws-java-sdk-bundle/1.12.367//aws-java-sdk-bundle-1.12.367.jar +aws-java-sdk-bundle/1.12.262//aws-java-sdk-bundle-1.12.262.jar azure-data-lake-store-sdk/2.3.9//azure-data-lake-store-sdk-2.3.9.jar azure-keyvault-core/1.0.0//azure-keyvault-core-1.0.0.jar azure-storage/7.0.1//azure-storage-7.0.1.jar @@ -66,16 +66,17 @@ gcs-connector/hadoop3-2.2.14/shaded/gcs-connector-hadoop3-2.2.14-shaded.jar gmetric4j/1.0.10//gmetric4j-1.0.10.jar gson/2.2.4//gson-2.2.4.jar guava/14.0.1//guava-14.0.1.jar -hadoop-aliyun/3.3.6//hadoop-aliyun-3.3.6.jar -hadoop-annotations/3.3.6//hadoop-annotations-3.3.6.jar -hadoop-aws/3.3.6//hadoop-aws-3.3.6.jar -hadoop-azure-datalake/3.3.6//hadoop-azure-datalake-3.3.6.jar -hadoop-azure/3.3.6//hadoop-azure-3.3.6.jar -hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar -hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar -hadoop-cloud-storage/3.3.6//hadoop-cloud-storage-3.3.6.jar +hadoop-aliyun/3.3.4//hadoop-aliyun-3.3.4.jar +hadoop-annotations/3.3.4//hadoop-annotations-3.3.4.jar +hadoop-aws/3.3.4//hadoop-aws-3.3.4.jar +hadoop-azure-datalake/3.3.4//hadoop-azure-datalake-3.3.4.jar +hadoop-azure/3.3.4//hadoop-azure-3.3.4.jar +hadoop-client-api/3.3.4//hadoop-client-api-3.3.4.jar +hadoop-client-runtime/3.3.4//hadoop-client-runtime-3.3.4.jar +hadoop-cloud-storage/3.3.4//hadoop-cloud-storage-3.3.4.jar +hadoop-openstack/3.3.4//hadoop-openstack-3.3.4.jar hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar -hadoop-yarn-server-web-proxy/3.3.6//hadoop-yarn-server-web-proxy-3.3.6.jar +hadoop-yarn-server-web-proxy/3.3.4//hadoop-yarn-server-web-proxy-3.3.4.jar hive-beeline/2.3.9//hive-beeline-2.3.9.jar hive-cli/2.3.9//hive-cli-2.3.9.jar hive-common/2.3.9//hive-common-2.3.9.jar @@ -115,6 +116,7 @@ janino/3.1.9//janino-3.1.9.jar javassist/3.29.2-GA//javassist-3.29.2-GA.jar javax.jdo/3.2.0-m3//javax.jdo-3.2.0-m3.jar javolution/5.5.1//javolution-5.5.1.jar +jaxb-api/2.2.11//jaxb-api-2.2.11.jar jaxb-runtime/2.3.2//jaxb-runtime-2.3.2.jar jcl-over-slf4j/2.0.7//jcl-over-slf4j-2.0.7.jar jdo-api/3.0.1//jdo-api-3.0.1.jar @@ -125,7 +127,7 @@ jersey-container-servlet-core/2.40//jersey-container-servlet-core-2.40.jar jersey-container-servlet/2.40//jersey-container-servlet-2.40.jar jersey-hk2/2.40//jersey-hk2-2.40.jar jersey-server/2.40//jersey-server-2.40.jar -jettison/1.5.4//jettison-1.5.4.jar +jettison/1.1//jettison-1.1.jar jetty-util-ajax/9.4.51.v20230217//jetty-util-ajax-9.4.51.v20230217.jar jetty-util/9.4.51.v20230217//jetty-util-9.4.51.v20230217.jar jline/2.14.6//jline-2.14.6.jar @@ -246,7 +248,7 @@ threeten-extra/1.7.1//threeten-extra-1.7.1.jar tink/1.9.0//tink-1.9.0.jar transaction-api/1.1//transaction-api-1.1.jar univocity-parsers/2.9.1//univocity-parsers-2.9.1.jar -wildfly-openssl/1.1.3.Final//wildfly-openssl-1.1.3.Final.jar +wildfly-openssl/1.0.7.Final//wildfly-openssl-1.0.7.Final.jar xbean-asm9-shaded/4.23//xbean-asm9-shaded-4.23.jar xz/1.9//xz-1.9.jar zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 309abba8da15..2b1930786206 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -134,6 +134,12 @@ hadoop-azure ${hadoop.version} ${hadoop.deps.scope} + + + org.codehaus.jackson + jackson-core-asl + + - 3.3.6 + 3.3.4 3.23.4 3.11.4 diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala index 2765e6af521c..a28a0464e6ee 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/client/IsolatedClientLoader.scala @@ -66,7 +66,7 @@ private[hive] object IsolatedClientLoader extends Logging { case e: RuntimeException if e.getMessage.contains("hadoop") => // If the error message contains hadoop, it is probably because the hadoop // version cannot be resolved. - val fallbackVersion = "3.3.6" + val fallbackVersion = "3.3.4" logWarning(s"Failed to resolve Hadoop artifacts for the version $hadoopVersion. We " + s"will change the hadoop version from $hadoopVersion to $fallbackVersion and try " + "again. It is recommended to set jars used by Hive metastore client through " +