Skip to content

Commit 6df25ca

Browse files
committed
[WIP] [SPARK-3996]: Shade Jetty in Spark deliverables
This patch piggy-back's on @vanzin's work to simplify the Guava shading, and adds Jetty as a shaded library in Spark. Other than adding Jetty, it consilidates the <artifactSet>'s into the root pom. I found it was a bit easier to follow that way, since you don't need to look into child pom's to find out specific artifact sets included in shading.
1 parent f9e5694 commit 6df25ca

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

network/common/pom.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,6 @@
101101
</execution>
102102
</executions>
103103
</plugin>
104-
<plugin>
105-
<groupId>org.apache.maven.plugins</groupId>
106-
<artifactId>maven-shade-plugin</artifactId>
107-
<configuration>
108-
<shadedArtifactAttached>false</shadedArtifactAttached>
109-
<artifactSet>
110-
<includes>
111-
<include>com.google.guava:guava</include>
112-
</includes>
113-
</artifactSet>
114-
</configuration>
115-
</plugin>
116104
</plugins>
117105
</build>
118106
</project>

pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,10 +1276,26 @@
12761276
<shadedArtifactAttached>false</shadedArtifactAttached>
12771277
<artifactSet>
12781278
<includes>
1279+
<!-- At a minimum we must include this to force effective pom generation -->
12791280
<include>org.spark-project.spark:unused</include>
1281+
1282+
<include>org.eclipse.jetty:jetty-io</include>
1283+
<include>org.eclipse.jetty:jetty-http</include>
1284+
<include>org.eclipse.jetty:jetty-plus</include>
1285+
<include>org.eclipse.jetty:jetty-security</include>
1286+
<include>org.eclipse.jetty:jetty-util</include>
1287+
<include>org.eclipse.jetty:jetty-server</include>
1288+
<include>com.google.guava:guava</include>
12801289
</includes>
12811290
</artifactSet>
12821291
<relocations>
1292+
<relocation>
1293+
<pattern>org.eclipse.jetty</pattern>
1294+
<shadedPattern>org.spark-project.jetty</shadedPattern>
1295+
<includes>
1296+
<include>org.eclipse.jetty.**</include>
1297+
</includes>
1298+
</relocation>
12831299
<relocation>
12841300
<pattern>com.google.common</pattern>
12851301
<shadedPattern>org.spark-project.guava</shadedPattern>

0 commit comments

Comments
 (0)