MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dependabot wants to merge 7 commits into from
Closed

MINOR: Bump org.apache:apache from 33 to 35 #799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4eeb03b
MINOR: Bump org.apache:apache from 33 to 35
dependabot[bot] Jul 21, 2025
061442f
Use bundled xsimd
kou Jul 29, 2025
d52e397
Use manylinux-2-28
kou Jul 29, 2025
0c12487
Ensure using the latest image
kou Jul 29, 2025
6543b16
Update for new manylinux image
kou Aug 11, 2025
e9b245d
Use amd64 for vcpkg
kou Aug 11, 2025
d99ac0a
Remove unused parameters
kou Aug 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/rc.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build Docker image
env:
VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
run: |
docker compose build --pull vcpkg-jni
- name: Cache
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
Expand Down
2 changes: 1 addition & 1 deletion bom/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>33</version>
<version>35</version>
<relativePath></relativePath>
</parent>

Expand Down
21 changes: 17 additions & 4 deletions ci/docker/vcpkg-jni.dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
--mount=type=secret,id=github_token \
--mount=type=secret,id=vcpkg_binary_sources \
export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
vcpkg install \
--clean-after-build \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
--x-feature=json \
--x-feature=parquet \
--x-feature=gandiva \
--x-feature=s3
--x-feature=s3 && \
rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down
18 changes: 13 additions & 5 deletions ci/scripts/jni_manylinux_build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
vcpkg_arch=amd64
;;
aarch64)
vcpkg_arch=arm64
;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
-DGTest_SOURCE=BUNDLED \
-DORC_SOURCE=BUNDLED \
-DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
-DPARQUET_BUILD_EXAMPLES=OFF \
-DPARQUET_BUILD_EXECUTABLES=OFF \
-DPARQUET_REQUIRE_ENCRYPTION=OFF \
-DVCPKG_MANIFEST_MODE=OFF \
-DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
-Dxsimd_SOURCE=BUNDLED \
-GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down
14 changes: 13 additions & 1 deletion compose.yaml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
cache_from:
- ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
args:
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
secrets:
- github_repository_owner
- github_token
- vcpkg_binary_sources
volumes:
- .:/arrow-java:delegated
- ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
command:
["git config --global --add safe.directory /arrow-java && \
/arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
github_repository_owner:
environment: GITHUB_REPOSITORY_OWNER
github_token:
environment: GITHUB_TOKEN
vcpkg_binary_sources:
environment: VCPKG_BINARY_SOURCES
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>34</version>
<version>35</version>
</parent>

<groupId>org.apache.arrow</groupId>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
MINOR: Bump org.apache:apache from 33 to 35#799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

dependabot
wants to merge
7
commits into

from

 Closed


MINOR: Bump org.apache:apache from 33 to 35
#799
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
4eeb03b

MINOR: Bump org.apache:apache from 33 to 35


dependabot[bot] Jul 21, 2025
061442f

Use bundled xsimd


kou Jul 29, 2025
d52e397

Use manylinux-2-28


kou Jul 29, 2025
0c12487

Ensure using the latest image


kou Jul 29, 2025
6543b16

Update for new manylinux image


kou Aug 11, 2025
e9b245d

Use amd64 for vcpkg


kou Aug 11, 2025
d99ac0a

Remove unused parameters


kou Aug 12, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


5 changes: 5 additions & 0 deletions
.github/workflows/rc.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -138,6 +138,11 @@ jobs:
 registry: ghcr.io
 username: ${{ github.actor }}
 password: ${{ secrets.GITHUB_TOKEN }}
 - name: Build Docker image
 env:
 VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"
 run: |
 docker compose build --pull vcpkg-jni
 - name: Cache
 uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
 with:
Expand Down

2 changes: 1 addition & 1 deletion
bom/pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>33</version>
 <version>35</version>
 <relativePath></relativePath>
 </parent>

Expand Down

21 changes: 17 additions & 4 deletions
ci/docker/vcpkg-jni.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,9 +18,21 @@
ARG base
FROM ${base}

# Install the libraries required by Gandiva to run
# Use enable llvm[enable-rtti] in the vcpkg.json to avoid link problems in Gandiva
RUN vcpkg install \
# For --mount=type=secret: The GITHUB_TOKEN is the only real secret
# but we use --mount=type=secret for GITHUB_REPOSITORY_OWNER and
# VCPKG_BINARY_SOURCES too because we don't want to store them into
# the built image in order to easily reuse the built image cache.
#
# Install the libraries required by Gandiva to run. Use enable
# llvm[enable-rtti] in the vcpkg.json to avoid link problems in
# Gandiva.
RUN --mount=type=secret,id=github_repository_owner \
 --mount=type=secret,id=github_token \
 --mount=type=secret,id=vcpkg_binary_sources \
 export GITHUB_REPOSITORY_OWNER=$(cat /run/secrets/github_repository_owner); \
 export GITHUB_TOKEN=$(cat /run/secrets/github_token); \
 export VCPKG_BINARY_SOURCES=$(cat /run/secrets/vcpkg_binary_sources); \
 vcpkg install \
 --clean-after-build \
 --x-install-root=${VCPKG_ROOT}/installed \
 --x-manifest-root=/arrow/ci/vcpkg \
Expand All@@ -30,7 +42,8 @@ RUN vcpkg install \
 --x-feature=json \
 --x-feature=parquet \
 --x-feature=gandiva \
 --x-feature=s3
 --x-feature=s3 && \
 rm -rf ~/.config/NuGet/

# Install Java
# We need Java for JNI headers, but we don't invoke Maven in this build.
Expand Down

18 changes: 13 additions & 5 deletions
ci/scripts/jni_manylinux_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,8 +53,16 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
fi

github_actions_group_begin "Building Arrow C++ libraries"
devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
case "$(arch)" in
x86_64)
 vcpkg_arch=amd64
 ;;
aarch64)
 vcpkg_arch=arm64
 ;;
esac
gcc_toolset_version="$(rpm -qa "gcc-toolset-*-runtime" --queryformat '%{VERSION}' | grep -o "^[0-9]*")"
gcc_toolset_include_cpp="/opt/rh/gcc-toolset-${gcc_toolset_version}/root/usr/include/c++/${gcc_toolset_version}"
: "${ARROW_ACERO:=ON}"
export ARROW_ACERO
: "${ARROW_BUILD_TESTS:=OFF}"
Expand All@@ -75,8 +83,8 @@ export ARROW_ORC
: "${CMAKE_UNITY_BUILD:=ON}"
: "${VCPKG_ROOT:=/opt/vcpkg}"
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-lpthread}"
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-${vcpkg_arch}-linux-static-${CMAKE_BUILD_TYPE}}}"
: "${GANDIVA_CXX_FLAGS:=-isystem;${gcc_toolset_include_cpp};-isystem;${gcc_toolset_include_cpp}/$(arch)-redhat-linux;-lpthread}"

export ARROW_TEST_DATA="${arrow_dir}/testing/data"
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
Expand DownExpand Up@@ -111,12 +119,12 @@ cmake \
 -DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
 -DGTest_SOURCE=BUNDLED \
 -DORC_SOURCE=BUNDLED \
 -DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
 -DPARQUET_BUILD_EXAMPLES=OFF \
 -DPARQUET_BUILD_EXECUTABLES=OFF \
 -DPARQUET_REQUIRE_ENCRYPTION=OFF \
 -DVCPKG_MANIFEST_MODE=OFF \
 -DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
 -Dxsimd_SOURCE=BUNDLED \
 -GNinja
cmake --build "${build_dir}/cpp"
cmake --install "${build_dir}/cpp"
Expand Down

14 changes: 13 additions & 1 deletion
compose.yaml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,7 +99,11 @@ services:
 cache_from:
 - ${REPO}:${ARCH}-vcpkg-jni-${VCPKG}
 args:
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
 base: ${ARROW_REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2-28-vcpkg-${VCPKG}
 secrets:
 - github_repository_owner
 - github_token
 - vcpkg_binary_sources
 volumes:
 - .:/arrow-java:delegated
 - ${ARROW_REPO_ROOT}:/arrow:delegated
Expand All@@ -111,3 +115,11 @@ services:
 command:
 ["git config --global --add safe.directory /arrow-java && \
 /arrow-java/ci/scripts/jni_manylinux_build.sh /arrow-java /arrow /build/java /arrow-java/jni"]

secrets:
 github_repository_owner:
 environment: GITHUB_REPOSITORY_OWNER
 github_token:
 environment: GITHUB_TOKEN
 vcpkg_binary_sources:
 environment: VCPKG_BINARY_SOURCES

2 changes: 1 addition & 1 deletion
pom.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ under the License.
 <parent>
 <groupId>org.apache</groupId>
 <artifactId>apache</artifactId>
 <version>34</version>
 <version>35</version>
 </parent>

 <groupId>org.apache.arrow</groupId>
Expand Down
Loading