Skip to content

Commit 8b897e8

Browse files
committed
Shade another transitive dependency introduced by s2: fastutil
1 parent d5e7862 commit 8b897e8

4 files changed

Lines changed: 20 additions & 9 deletions

File tree

common/pom.xml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,15 @@
147147
</execution>
148148
</executions>
149149
</plugin>
150-
<!-- Shade some dependencies into sedona-common to resolve various package conflict issues -->
151150
<plugin>
151+
<!--
152+
We need to shade jiffle and its antlr and janino dependencies for the following reasons:
153+
154+
1. Databricks runtime uses an older version of janino (3.0.16) that does not work
155+
with jiffle in Spark repl. See https://github.com/apache/sedona/discussions/1945
156+
157+
2. Spark 4 uses an incompatible version of antlr at runtime.
158+
-->
152159
<groupId>org.apache.maven.plugins</groupId>
153160
<artifactId>maven-shade-plugin</artifactId>
154161
<executions>
@@ -160,14 +167,6 @@
160167
<configuration>
161168
<artifactSet>
162169
<includes>
163-
<!--
164-
We need to shade jiffle and its antlr and janino dependencies for the following reasons:
165-
166-
1. Databricks runtime uses an older version of janino (3.0.16) that does not work
167-
with jiffle in Spark repl. See https://github.com/apache/sedona/discussions/1945
168-
169-
2. Spark 4 uses an incompatible version of antlr at runtime.
170-
-->
171170
<include>it.geosolutions.jaiext.jiffle:*</include>
172171
<include>org.antlr:*</include>
173172
<include>org.codehaus.janino:*</include>

flink-shaded/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@
104104
<pattern>com.google.common</pattern>
105105
<shadedPattern>org.apache.sedona.shaded.guava</shadedPattern>
106106
</relocation>
107+
<relocation>
108+
<pattern>it.unimi.dsi.fastutil</pattern>
109+
<shadedPattern>org.apache.sedona.shaded.fastutil</shadedPattern>
110+
</relocation>
107111
</relocations>
108112
<filters>
109113
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215 -->

snowflake/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@
147147
<pattern>com.google.common</pattern>
148148
<shadedPattern>org.apache.sedona.shaded.guava</shadedPattern>
149149
</relocation>
150+
<relocation>
151+
<pattern>it.unimi.dsi.fastutil</pattern>
152+
<shadedPattern>org.apache.sedona.shaded.fastutil</shadedPattern>
153+
</relocation>
150154
</relocations>
151155
<filters>
152156
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215 -->

spark-shaded/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,10 @@
257257
<pattern>com.google.common</pattern>
258258
<shadedPattern>org.apache.sedona.shaded.guava</shadedPattern>
259259
</relocation>
260+
<relocation>
261+
<pattern>it.unimi.dsi.fastutil</pattern>
262+
<shadedPattern>org.apache.sedona.shaded.fastutil</shadedPattern>
263+
</relocation>
260264
</relocations>
261265
<filters>
262266
<!-- filter to address "Invalid signature file" issue - see http://stackoverflow.com/a/6743609/589215 -->

0 commit comments

Comments
 (0)