Skip to content

[GH-1996] Shade S2 and Guava into runtime JARs#2054

Merged
jiayuasu merged 6 commits into
apache:masterfrom
Kontinuation:shade-s2-and-guava
Jul 4, 2025
Merged

[GH-1996] Shade S2 and Guava into runtime JARs#2054
jiayuasu merged 6 commits into
apache:masterfrom
Kontinuation:shade-s2-and-guava

Conversation

@Kontinuation

@Kontinuation Kontinuation commented Jul 3, 2025

Copy link
Copy Markdown
Member

Did you read the Contributor Guide?

Is this PR related to a ticket?

  • Yes, and the PR name follows the format [GH-XXX] my subject.

What changes were proposed in this PR?

As discussed in #1996 (comment), we have switched s2 dependency to our own org.datasyslab:s2-geometry-library. This may cause conflicts if there's com.google.geometry:s2-geometry packages in the runtime environment. We decided to shade it into runtime jars to get rid of possible conflicts.

org.datasyslab:s2-geometry-library depends on a recent version of Guava, which is incompatible with the Guava jar shipped with Apache Spark, so we have to shade guava into runtime jars as well.

We have also cherry-picked e005f23#diff-9c5fb3d1b7e3b0f54bc5c4182965c4fe1f9023d449017cece3005d3f90e8e4d8 into this PR, this is for fixing problems with shading janino found when releasing 1.7.2.

How was this patch tested?

  • Passing existing tests
  • Manually tested the spark-shaded jar in local environment

Did this PR include necessary documentation updates?

  • No, this PR does not affect any public API so no need to change the documentation.

@Kontinuation Kontinuation marked this pull request as ready for review July 3, 2025 11:50
@Kontinuation Kontinuation requested a review from jiayuasu as a code owner July 3, 2025 11:50
@Kontinuation Kontinuation changed the title [GH-1996] Shade S2 into sedona-common [GH-1996] Shade S2 and Guava into runtime JARs Jul 3, 2025
@jiayuasu jiayuasu merged commit 4540bca into apache:master Jul 4, 2025
35 of 44 checks passed
Kontinuation added a commit to Kontinuation/sedona that referenced this pull request Jan 21, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants