Skip to content

[GH-1945] Shade Jiffle and its dependencies #1964

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

Merged
jiayuasu merged 2 commits into from
May 30, 2025
Merged

[GH-1945] Shade Jiffle and its dependencies #1964

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
94ce9b4
Shade jiffle and its dependencies
Kontinuation May 30, 2025
e7b9477
Fix lint warning
Kontinuation May 30, 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
85 changes: 72 additions & 13 deletions common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,6 @@
<groupId>it.geosolutions.jaiext.jiffle</groupId>
<artifactId>jt-jiffle-language</artifactId>
</dependency>
<!-- These test dependencies are for running map algebra tests -->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>${antlr-runtime.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
<artifactId>cdm-core</artifactId>
Expand All @@ -134,6 +121,78 @@
<target>11</target>
</configuration>
</plugin>
<plugin>
<!-- Skip running resolved-pom-maven-plugin since shade will
generate dependency reduced pom which substitutes property
values. resolved-pom-maven-plugin will break pom
installation when working with maven-shade-plugin. -->
<groupId>io.paradoxical</groupId>
<artifactId>resolved-pom-maven-plugin</artifactId>
<version>1.0</version>
<executions>
<execution>
<id>resolve-my-pom</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<!--
We need to shade jiffle and its antlr and janino dependencies for the following reasons:

1. Databricks runtime uses an older version of janino (3.0.16) that does not work
with jiffle in Spark repl. See https://github.com/apache/sedona/discussions/1945

2. Spark 4 uses an incompatible version of antlr at runtime.
-->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<artifactSet>
<includes>
<include>it.geosolutions.jaiext.jiffle:*</include>
<include>org.antlr:*</include>
<include>org.codehaus.janino:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>it.geosolutions.jaiext.jiffle</pattern>
<shadedPattern>org.apache.sedona.shaded.jiffle</shadedPattern>
<excludes>
<exclude>it.geosolutions.jaiext.jiffle.runtime.*</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.antlr.v4.runtime</pattern>
<shadedPattern>org.apache.sedona.shaded.antlr</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus</pattern>
<shadedPattern>org.apache.sedona.shaded.codehaus</shadedPattern>
</relocation>
</relocations>
<filters>
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215 -->
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
14 changes: 11 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<scala.compat.version>2.12</scala.compat.version>
<spark.version>3.4.0</spark.version>
<spark.compat.version>3.4</spark.compat.version>
<log4j.version>2.17.2</log4j.version>
<log4j.version>2.19.0</log4j.version>
<graphframe.version>0.8.3-spark3.4</graphframe.version>

<flink.version>1.19.0</flink.version>
Expand Down Expand Up @@ -272,12 +272,15 @@
<groupId>it.geosolutions.jaiext.jiffle</groupId>
<artifactId>jt-jiffle-language</artifactId>
<version>${jt-jiffle.version}</version>
<scope>${geotools.scope}</scope>
<exclusions>
<exclusion>
<groupId>*</groupId>
<groupId>javax.media</groupId>
<artifactId>*</artifactId>
</exclusion>
<exclusion>
<groupId>it.geosolutions.jaiext.utilities</groupId>
<artifactId>jt-utilities</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down Expand Up @@ -341,6 +344,11 @@
<version>4.0.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>${janino-version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
5 changes: 5 additions & 0 deletions spark-shaded/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>*</artifactId>
</exclusion>
<!-- Even those these are shaded, the shaded POM isn't used when building projects in a single Maven run -->
<exclusion>
<groupId>it.geosolutions.jaiext.jiffle</groupId>
<artifactId>jt-jiffle-language</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 0 additions & 4 deletions spark/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,6 @@
<groupId>org.geotools</groupId>
<artifactId>gt-arcgrid</artifactId>
</dependency>
<dependency>
<groupId>it.geosolutions.jaiext.jiffle</groupId>
<artifactId>jt-jiffle-language</artifactId>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
Expand Down
Loading