This is an automated email from the ASF dual-hosted git repository.
sekikn pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new a7bca2aa BIGTOP-3736. Bump Hadoop to 3.2.4 in branch-3.1. (#942)
a7bca2aa is described below
commit a7bca2aa48d1e69656c779bafc4ddf6c3661787b
Author: Masatake Iwasaki <[email protected]>
AuthorDate: Fri Jul 22 17:11:38 2022 +0900
BIGTOP-3736. Bump Hadoop to 3.2.4 in branch-3.1. (#942)
* BIGTOP-3736. Bump Hadoop to 3.2.4 in branch-3.1.
* updated exclusion rule to address migration to reload4j.
* Hadoop 3.2.4 was released.
---
.../patch0-exclude-netty-from-zookeeper.diff | 14 ++---
.../src/common/hadoop/patch10-MAPREDUCE-7373.diff | 12 ----
.../common/hadoop/patch9-revert-HADOOP-17196.diff | 73 ----------------------
.../src/common/hive/patch10-exclude-reload4j.diff | 13 ++++
bigtop.bom | 4 +-
5 files changed, 22 insertions(+), 94 deletions(-)
diff --git
a/bigtop-packages/src/common/hadoop/patch0-exclude-netty-from-zookeeper.diff
b/bigtop-packages/src/common/hadoop/patch0-exclude-netty-from-zookeeper.diff
index 2388e6a7..19c47472 100644
--- a/bigtop-packages/src/common/hadoop/patch0-exclude-netty-from-zookeeper.diff
+++ b/bigtop-packages/src/common/hadoop/patch0-exclude-netty-from-zookeeper.diff
@@ -1,10 +1,10 @@
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
-index ce2a268..d1da396 100644
+index 23d1c87..d38feb4 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
-@@ -1192,6 +1192,14 @@
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+@@ -1234,6 +1234,14 @@
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-reload4j</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
@@ -17,9 +17,9 @@ index ce2a268..d1da396 100644
</exclusions>
</dependency>
<dependency>
-@@ -1208,6 +1216,14 @@
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
+@@ -1258,6 +1266,14 @@
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>io.netty</groupId>
diff --git a/bigtop-packages/src/common/hadoop/patch10-MAPREDUCE-7373.diff
b/bigtop-packages/src/common/hadoop/patch10-MAPREDUCE-7373.diff
deleted file mode 100644
index 51229a38..00000000
--- a/bigtop-packages/src/common/hadoop/patch10-MAPREDUCE-7373.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
-index ae3b9c6029e..4c32838afb0 100644
----
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
-+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt
-@@ -27,6 +27,7 @@ set(GTEST_SRC_DIR
${CMAKE_SOURCE_DIR}/../../../../hadoop-common-project/hadoop-c
- # Add extra compiler and linker flags.
- # -Wno-sign-compare
- hadoop_add_compiler_flags("-DNDEBUG -DSIMPLE_MEMCPY -fno-strict-aliasing
-fsigned-char")
-+set(CMAKE_CXX_STANDARD 11)
-
- # Source location.
- set(SRC main/native)
diff --git a/bigtop-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
b/bigtop-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
deleted file mode 100644
index 933bc7b4..00000000
--- a/bigtop-packages/src/common/hadoop/patch9-revert-HADOOP-17196.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-commit f790a72a4c68e242b5d54323c607e18d5dbda394
-Author: Masatake Iwasaki <[email protected]>
-Date: Fri May 14 11:48:47 2021 +0000
-
- Revert "HADOOP-17196. Fix C/C++ standard warnings (#2208)"
-
- This reverts commit ff907b310d905fde648dc6db8954e425c24e3bf3.
-
-diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-index 7628ecf..4de70ac 100644
---- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-+++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake
-@@ -193,7 +193,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- # Solaris flags. 64-bit compilation is mandatory, and is checked earlier.
- hadoop_add_compiler_flags("-m64 -D_POSIX_C_SOURCE=200112L
-D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS")
-- set(CMAKE_CXX_STANDARD 98)
-+ set(CMAKE_CXX_FLAGS "-std=gnu++98 ${CMAKE_CXX_FLAGS}")
- hadoop_add_linker_flags("-m64")
-
- # CMAKE_SYSTEM_PROCESSOR is set to the output of 'uname -p', which on
Solaris is
-@@ -212,4 +212,4 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
- endif()
-
- # Set GNU99 as the C standard to use
--set(CMAKE_C_STANDARD 99)
-\ No newline at end of file
-+set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
-\ No newline at end of file
-diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-index 18396c7..1676e31 100644
---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/CMakeLists.txt
-@@ -152,8 +152,7 @@ add_subdirectory(main/native/libhdfs-tests)
- # Temporary fix to disable Libhdfs++ build on older systems that do not
support thread_local
- include(CheckCXXSourceCompiles)
- unset (THREAD_LOCAL_SUPPORTED CACHE)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_STANDARD_REQUIRED ON)
-+set (CMAKE_REQUIRED_DEFINITIONS "-std=c++11")
- set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- check_cxx_source_compiles(
- "#include <thread>
-diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-index 2da5b6bb..c17f9d3 100644
----
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-+++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/CMakeLists.txt
-@@ -51,8 +51,7 @@ include(CheckCXXSourceCompiles)
-
- # Check if thread_local is supported
- unset (THREAD_LOCAL_SUPPORTED CACHE)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_STANDARD_REQUIRED ON)
-+set (CMAKE_REQUIRED_DEFINITIONS "-std=c++11")
- set (CMAKE_REQUIRED_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
- check_cxx_source_compiles(
- "#include <thread>
-@@ -148,13 +147,12 @@ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
-
- if(UNIX)
--set (CMAKE_CXX_STANDARD 11)
--set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -g -fPIC
-fno-strict-aliasing")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -std=c++11
-g -fPIC -fno-strict-aliasing")
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fPIC -fno-strict-aliasing")
- endif()
-
- if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-- set(CMAKE_CXX_STANDARD 11)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
- add_definitions(-DASIO_HAS_STD_ADDRESSOF -DASIO_HAS_STD_ARRAY
-DASIO_HAS_STD_ATOMIC -DASIO_HAS_CSTDINT -DASIO_HAS_STD_SHARED_PTR
-DASIO_HAS_STD_TYPE_TRAITS -DASIO_HAS_VARIADIC_TEMPLATES
-DASIO_HAS_STD_FUNCTION -DASIO_HAS_STD_CHRONO -DASIO_HAS_STD_SYSTEM_ERROR)
- endif ()
-
diff --git a/bigtop-packages/src/common/hive/patch10-exclude-reload4j.diff
b/bigtop-packages/src/common/hive/patch10-exclude-reload4j.diff
new file mode 100644
index 00000000..f87c1e1a
--- /dev/null
+++ b/bigtop-packages/src/common/hive/patch10-exclude-reload4j.diff
@@ -0,0 +1,13 @@
+diff --git a/standalone-metastore/src/assembly/bin.xml
b/standalone-metastore/src/assembly/bin.xml
+index 81912d7..ebb0409 100644
+--- a/standalone-metastore/src/assembly/bin.xml
++++ b/standalone-metastore/src/assembly/bin.xml
+@@ -41,7 +41,7 @@
+ <excludes>
+ <exclude>org.apache.hadoop:*</exclude>
+ <exclude>org.slf4j:*</exclude>
+- <exclude>log4j:*</exclude>
++ <exclude>ch.qos.reload4j:*</exclude>
+ </excludes>
+ </dependencySet>
+ </dependencySets>
diff --git a/bigtop.bom b/bigtop.bom
index 48b79773..01943ecc 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -145,7 +145,7 @@ bigtop {
'hadoop' {
name = 'hadoop'
relNotes = 'Apache Hadoop'
- version { base = '3.2.3'; pkg = base; release = 2 }
+ version { base = '3.2.4'; pkg = base; release = 1 }
tarball { destination = "${name}-${version.base}.tar.gz"
source = "${name}-${version.base}-src.tar.gz" }
url { download_path = "/$name/common/$name-${version.base}"
@@ -166,7 +166,7 @@ bigtop {
'hive' {
name = 'hive'
relNotes = 'Apache Hive'
- version { base = '3.1.2'; pkg = base; release = 3 }
+ version { base = '3.1.2'; pkg = base; release = 4 }
tarball { destination = "apache-${name}-${version.base}-src.tar.gz"
source = destination }
url { download_path = "/$name/$name-${version.base}/"
