Skip to content

Commit

Permalink
rdar://106150608 Bump Hadoop to 3.3.4.3-apple (apache#1697)
Browse files Browse the repository at this point in the history
  • Loading branch information
Steve Vaughan Jr authored and GitHub Enterprise committed Mar 16, 2023
1 parent 06cd4cb commit 924a4ac
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
20 changes: 10 additions & 10 deletions dev/deps/spark-deps-hadoop-3-hive-2.3
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ gcs-connector/hadoop3-2.2.7/shaded/gcs-connector-hadoop3-2.2.7-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.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-aliyun/3.3.4.3-apple//hadoop-aliyun-3.3.4.3-apple.jar
hadoop-annotations/3.3.4.3-apple//hadoop-annotations-3.3.4.3-apple.jar
hadoop-aws/3.3.4.3-apple//hadoop-aws-3.3.4.3-apple.jar
hadoop-azure-datalake/3.3.4.3-apple//hadoop-azure-datalake-3.3.4.3-apple.jar
hadoop-azure/3.3.4.3-apple//hadoop-azure-3.3.4.3-apple.jar
hadoop-client-api/3.3.4.3-apple//hadoop-client-api-3.3.4.3-apple.jar
hadoop-client-runtime/3.3.4.3-apple//hadoop-client-runtime-3.3.4.3-apple.jar
hadoop-cloud-storage/3.3.4.3-apple//hadoop-cloud-storage-3.3.4.3-apple.jar
hadoop-openstack/3.3.4.3-apple//hadoop-openstack-3.3.4.3-apple.jar
hadoop-shaded-guava/1.1.1//hadoop-shaded-guava-1.1.1.jar
hadoop-yarn-server-web-proxy/3.3.4//hadoop-yarn-server-web-proxy-3.3.4.jar
hadoop-yarn-server-web-proxy/3.3.4.3-apple//hadoop-yarn-server-web-proxy-3.3.4.3-apple.jar
hive-beeline/2.3.9.4-apple//hive-beeline-2.3.9.4-apple.jar
hive-cli/2.3.9.4-apple//hive-cli-2.3.9.4-apple.jar
hive-common/2.3.9.4-apple//hive-common-2.3.9.4-apple.jar
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<slf4j.version>2.0.6</slf4j.version>
<log4j.version>2.19.0</log4j.version>
<!-- make sure to update IsolatedClientLoader whenever this version is changed -->
<hadoop.version>3.3.4</hadoop.version>
<hadoop.version>3.3.4.3-apple</hadoop.version>
<!-- Protobuf version for building with Hadoop/Yarn dependencies -->
<protobuf.hadoopDependency.version>2.5.0</protobuf.hadoopDependency.version>
<!-- Actual Protobuf version in Spark modules like Spark Connect, protobuf connector, etc. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private[hive] object IsolatedClientLoader extends Logging {
// If the error message contains hadoop, it is probably because the hadoop
// version cannot be resolved.
val fallbackVersion = if (VersionUtils.isHadoop3) {
"3.3.4"
"3.3.4.3-apple"
} else {
"2.7.4"
}
Expand Down

0 comments on commit 924a4ac

Please sign in to comment.