Skip to content

Commit 66f7ddd

Browse files
committed
YARN-10314. YarnClient throws NoClassDefFoundError for WebSocketException with only shaded client jars
1 parent 81d8a88 commit 66f7ddd

File tree

2 files changed

+20
-7
lines changed
  • hadoop-client-modules

2 files changed

+20
-7
lines changed

hadoop-client-modules/hadoop-client-minicluster/pom.xml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,15 +811,25 @@
811811
<exclude>*/**</exclude>
812812
</excludes>
813813
</filter>
814-
<!-- Jetty 9.4.x: jetty-client and jetty-xml are depended by org.eclipse.jetty.websocket:websocket-client.
815-
But we are only excluding jetty-client not jetty-xml because HttpServer2 implicitly uses the shaded package name.
816-
-->
814+
<!-- Jetty 9.4.x: jetty-client and jetty-xml are depended by org.eclipse.jetty.websocket:websocket-client.-->
817815
<filter>
818816
<artifact>org.eclipse.jetty:jetty-client</artifact>
819817
<excludes>
820818
<exclude>*/**</exclude>
821819
</excludes>
822820
</filter>
821+
<filter>
822+
<artifact>org.eclipse.jetty:jetty-xml</artifact>
823+
<excludes>
824+
<exclude>*/**</exclude>
825+
</excludes>
826+
</filter>
827+
<filter>
828+
<artifact>org.eclipse.jetty:jetty-http</artifact>
829+
<excludes>
830+
<exclude>*/**</exclude>
831+
</excludes>
832+
</filter>
823833
</filters>
824834

825835
<!-- relocate classes from mssql-jdbc -->

hadoop-client-modules/hadoop-client-runtime/pom.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,8 @@
158158
<!-- the jdk ships part of the javax.annotation namespace, so if we want to relocate this we'll have to care it out by class :( -->
159159
<exclude>com.google.code.findbugs:jsr305</exclude>
160160
<exclude>io.dropwizard.metrics:metrics-core</exclude>
161-
<exclude>org.eclipse.jetty.websocket:*</exclude>
162161
<exclude>org.eclipse.jetty:jetty-servlet</exclude>
163162
<exclude>org.eclipse.jetty:jetty-security</exclude>
164-
<exclude>org.eclipse.jetty:jetty-client</exclude>
165-
<exclude>org.eclipse.jetty:jetty-http</exclude>
166-
<exclude>org.eclipse.jetty:jetty-xml</exclude>
167163
<exclude>org.ow2.asm:*</exclude>
168164
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
169165
<exclude>org.bouncycastle:*</exclude>
@@ -213,6 +209,13 @@
213209
<exclude>about.html</exclude>
214210
</excludes>
215211
</filter>
212+
<filter>
213+
<!-- skip jetty license info already incorporated into LICENSE/NOTICE -->
214+
<artifact>org.eclipse.jetty.websocket:*</artifact>
215+
<excludes>
216+
<exclude>about.html</exclude>
217+
</excludes>
218+
</filter>
216219
<filter>
217220
<!-- skip docs on formats used in kerby -->
218221
<artifact>org.apache.kerby:kerb-util</artifact>

0 commit comments

Comments
 (0)