Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions .github/actions/setup-spark-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,18 @@ runs:
# then resolves Spark's deps, Coursier sees the POM in mavenLocal,
# declares the artifact "found locally", and fails on the missing JAR
# without falling back to Maven Central. Delete those partial entries
# so sbt re-fetches the full artifact remotely.
# so sbt re-fetches the full artifact remotely. A POM with no
# <packaging> element is a jar, Maven's default. Arrow's POMs leave it
# out, and Spark 3.5's sql/api does not compile without the
# arrow-memory-core and arrow-memory-netty JARs.
for repo in "$HOME/.m2/repository" /root/.m2/repository; do
[ -d "$repo" ] || continue
find "$repo" -name '*.pom' | while read -r pom; do
jar="${pom%.pom}.jar"
[ -f "$jar" ] && continue
grep -q '<packaging>jar</packaging>\|<packaging>bundle</packaging>' "$pom" 2>/dev/null || continue
if grep -q '<packaging>' "$pom" 2>/dev/null; then
grep -q '<packaging>jar</packaging>\|<packaging>bundle</packaging>' "$pom" 2>/dev/null || continue
fi
rm -f "$pom" "${pom}.sha1" "${pom%.pom}.pom.lastUpdated" \
"$(dirname "$pom")/_remote.repositories"
done
Expand Down
120 changes: 61 additions & 59 deletions contrib/delta/native/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contrib/delta/native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ crate-type = ["rlib"]
datafusion-comet-proto = { path = "../../../native/proto" }
# For `ExecutionPlan` (return type), `SchemaRef` (the shim hands these in), and `DataFusionError`
# (the not-implemented error). Versions/features mirror core so the shared lockfile resolves cleanly.
datafusion = { version = "55.1.0", default-features = false, features = ["parquet"] }
datafusion = { version = "55.2.0", default-features = false, features = ["parquet"] }
Loading
Loading