This is an automated email from the ASF dual-hosted git repository.
apitrou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 5226a3b ARROW-14709: [C++][Java] Upgrade ORC to 1.7.1 and use the
official Apache distribution site
5226a3b is described below
commit 5226a3b5a0f29942f20d71fafd7e74c92f220ba1
Author: William Hyun <[email protected]>
AuthorDate: Thu Nov 25 19:22:19 2021 +0100
ARROW-14709: [C++][Java] Upgrade ORC to 1.7.1 and use the official Apache
distribution site
This PR aims to bump ORC to 1.7.1 and use the official Apache distribution
site.
Apache ORC 1.7.1 is a maintenance release with the following bug fixes.
- https://github.com/apache/orc/releases/tag/rel%2Frelease-1.7.1
Closes #11699 from williamhyun/orc171
Lead-authored-by: William Hyun <[email protected]>
Co-authored-by: Antoine Pitrou <[email protected]>
Signed-off-by: Antoine Pitrou <[email protected]>
---
cpp/cmake_modules/ThirdpartyToolchain.cmake | 2 +-
cpp/thirdparty/versions.txt | 6 +++---
java/adapter/orc/pom.xml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 085e8d4..72bd170 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -541,8 +541,8 @@ if(DEFINED ENV{ARROW_ORC_URL})
set(ORC_SOURCE_URL "$ENV{ARROW_ORC_URL}")
else()
set_urls(ORC_SOURCE_URL
+
"https://archive.apache.org/dist/orc/orc-${ARROW_ORC_BUILD_VERSION}/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz";
"https://github.com/apache/orc/archive/rel/release-${ARROW_ORC_BUILD_VERSION}.tar.gz";
-
"https://github.com/ursa-labs/thirdparty/releases/download/latest/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz";
)
endif()
diff --git a/cpp/thirdparty/versions.txt b/cpp/thirdparty/versions.txt
index fe47cf9..82b290c 100644
--- a/cpp/thirdparty/versions.txt
+++ b/cpp/thirdparty/versions.txt
@@ -66,8 +66,8 @@ ARROW_MIMALLOC_BUILD_VERSION=v1.7.2
ARROW_MIMALLOC_BUILD_SHA256_CHECKSUM=b1912e354565a4b698410f7583c0f83934a6dbb3ade54ab7ddcb1569320936bd
ARROW_NLOHMANN_JSON_BUILD_VERSION=v3.10.2
ARROW_NLOHMANN_JSON_BUILD_SHA256_CHECKSUM=081ed0f9f89805c2d96335c3acfa993b39a0a5b4b4cef7edb68dd2210a13458c
-ARROW_ORC_BUILD_VERSION=1.7.0
-ARROW_ORC_BUILD_SHA256_CHECKSUM=45d6ba9149ffa2aaa168d61ab326f61181861c94529f26da3918a9aa2f801e39
+ARROW_ORC_BUILD_VERSION=1.7.1
+ARROW_ORC_BUILD_SHA256_CHECKSUM=65d71e571238cbcb7c3cbb9a10f7ad988f452d17c58479154be3b9d6ec27d005
ARROW_PROTOBUF_BUILD_VERSION=v3.17.3
ARROW_PROTOBUF_BUILD_SHA256_CHECKSUM=77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2
# Because of https://github.com/Tencent/rapidjson/pull/1323, we require
@@ -119,7 +119,7 @@ DEPENDENCIES=(
"ARROW_LZ4_URL lz4-${ARROW_LZ4_BUILD_VERSION}.tar.gz
https://github.com/lz4/lz4/archive/${ARROW_LZ4_BUILD_VERSION}.tar.gz";
"ARROW_MIMALLOC_URL mimalloc-${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz
https://github.com/microsoft/mimalloc/archive/${ARROW_MIMALLOC_BUILD_VERSION}.tar.gz";
"ARROW_NLOHMANN_JSON_URL
nlohmann-json-${ARROW_NLOHMANN_JSON_BUILD_VERSION}.tar.gz
https://github.com/nlohmann/json/archive/refs/tags/${ARROW_NLOHMANN_JSON_BUILD_VERSION}.tar.gz";
- "ARROW_ORC_URL orc-${ARROW_ORC_BUILD_VERSION}.tar.gz
https://github.com/apache/orc/archive/rel/release-${ARROW_ORC_BUILD_VERSION}.tar.gz";
+ "ARROW_ORC_URL orc-${ARROW_ORC_BUILD_VERSION}.tar.gz
https://archive.apache.org/dist/orc/orc-${ARROW_ORC_BUILD_VERSION}/orc-${ARROW_ORC_BUILD_VERSION}.tar.gz";
"ARROW_PROTOBUF_URL protobuf-${ARROW_PROTOBUF_BUILD_VERSION}.tar.gz
https://github.com/google/protobuf/releases/download/${ARROW_PROTOBUF_BUILD_VERSION}/protobuf-all-${ARROW_PROTOBUF_BUILD_VERSION:1}.tar.gz";
"ARROW_RAPIDJSON_URL rapidjson-${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz
https://github.com/miloyip/rapidjson/archive/${ARROW_RAPIDJSON_BUILD_VERSION}.tar.gz";
"ARROW_RE2_URL re2-${ARROW_RE2_BUILD_VERSION}.tar.gz
https://github.com/google/re2/archive/${ARROW_RE2_BUILD_VERSION}.tar.gz";
diff --git a/java/adapter/orc/pom.xml b/java/adapter/orc/pom.xml
index a69a7ad..1f0e13d 100644
--- a/java/adapter/orc/pom.xml
+++ b/java/adapter/orc/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
- <version>1.7.0</version>
+ <version>1.7.1</version>
<scope>test</scope>
<exclusions>
<exclusion>
