Skip to content
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

spark-3.5-scala-2.13/3.5.4 package update #37961

Merged
merged 2 commits into from
Dec 23, 2024
Merged

spark-3.5-scala-2.13/3.5.4 package update #37961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f3b767
spark-3.5-scala-2.13/3.5.4 package update
wolfi-bot Dec 20, 2024
46415b1
Fix(build): Update the older patch so that it can get applied cleanly…
debasishbsws Dec 23, 2024
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
7 changes: 4 additions & 3 deletions spark-3.5-scala-2.13.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: spark-3.5-scala-2.13
version: 3.5.3
epoch: 2
version: 3.5.4
epoch: 0
description: Unified engine for large-scale data analytics
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -45,8 +45,9 @@ pipeline:
with:
repository: https://github.com/apache/spark
tag: v${{package.version}}
expected-commit: 32232e9ed33bb16b93ad58cfde8b82e0f07c0970
expected-commit: a6f220d951742f4074b37772485ee0ec7a774e7d

# These are not CVE patches, but patches to make the build work.
- uses: patch
with:
patches: make-distribution.patch mvn.patch
Expand Down
11 changes: 1 addition & 10 deletions spark-3.5-scala-2.13/mvn.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
diff --git a/build/mvn b/build/mvn
index 3179099304c..b0cb0a643d2 100755
index 2c778fd6c71..993dc98a5e7 100755
--- a/build/mvn
+++ b/build/mvn
@@ -56,7 +56,7 @@ install_app() {
local binary="${_DIR}/$6"
local remote_tarball="${mirror_host}/${url_path}${url_query}"
local local_checksum="${local_tarball}.${checksum_suffix}"
- local remote_checksum="https://archive.apache.org/dist/${url_path}.${checksum_suffix}"
+ local remote_checksum="${mirror_host}/${url_path}.${checksum_suffix}"

local curl_opts="--silent --show-error -L"
local wget_opts="--no-verbose"
@@ -121,7 +121,7 @@ install_mvn() {
fi
if [ $(version $MVN_DETECTED_VERSION) -ne $(version $MVN_VERSION) ]; then
Expand Down
Loading