Skip to content

Commit d3e7f4e

Browse files
committed
Fix for shaded deps causing compile errors
1 parent 19f0710 commit d3e7f4e

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

repl/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,30 @@
8787
<artifactId>scalacheck_${scala.binary.version}</artifactId>
8888
<scope>test</scope>
8989
</dependency>
90+
91+
<!-- Explicit listing of transitive deps that are shaded. Otherwise, odd compiler crashes. -->
92+
<dependency>
93+
<groupId>org.eclipse.jetty</groupId>
94+
<artifactId>jetty-server</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.eclipse.jetty</groupId>
98+
<artifactId>jetty-plus</artifactId>
99+
</dependency>
100+
<dependency>
101+
<groupId>org.eclipse.jetty</groupId>
102+
<artifactId>jetty-util</artifactId>
103+
</dependency>
104+
<dependency>
105+
<groupId>org.eclipse.jetty</groupId>
106+
<artifactId>jetty-http</artifactId>
107+
</dependency>
108+
<!-- End of shaded deps. -->
109+
110+
<dependency>
111+
<groupId>org.scala-lang</groupId>
112+
<artifactId>scala-library</artifactId>
113+
</dependency>
90114
</dependencies>
91115
<build>
92116
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>

streaming/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<artifactId>spark-core_${scala.binary.version}</artifactId>
4141
<version>${project.version}</version>
4242
</dependency>
43+
44+
<!-- Explicit listing of transitive deps that are shaded. Otherwise, odd compiler crashes. -->
4345
<dependency>
4446
<groupId>com.google.guava</groupId>
4547
<artifactId>guava</artifactId>
@@ -48,6 +50,20 @@
4850
<groupId>org.eclipse.jetty</groupId>
4951
<artifactId>jetty-server</artifactId>
5052
</dependency>
53+
<dependency>
54+
<groupId>org.eclipse.jetty</groupId>
55+
<artifactId>jetty-plus</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.eclipse.jetty</groupId>
59+
<artifactId>jetty-util</artifactId>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.eclipse.jetty</groupId>
63+
<artifactId>jetty-http</artifactId>
64+
</dependency>
65+
<!-- End of shaded deps. -->
66+
5167
<dependency>
5268
<groupId>org.scala-lang</groupId>
5369
<artifactId>scala-library</artifactId>

0 commit comments

Comments
 (0)