Skip to content

Commit ccbba59

Browse files
vinayakumarbsmengcl
authored andcommitted
YARN-10314. YarnClient throws NoClassDefFoundError for WebSocketException with only shaded client jars (apache#2075)
(cherry picked from commit fc4ebb0) Conflicts: hadoop-client-modules/hadoop-client-minicluster/pom.xml hadoop-client-modules/hadoop-client-runtime/pom.xml Change-Id: I36f64efb911a16b865a6b4856bd0f8d595af1c97
1 parent 87666e2 commit ccbba59

File tree

2 files changed

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

2 files changed

+20
-5
lines changed

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -779,15 +779,25 @@
779779
<exclude>ehcache-core.xsd</exclude>
780780
</excludes>
781781
</filter>
782-
<!-- Jetty 9.4.x: jetty-client and jetty-xml are depended by org.eclipse.jetty.websocket:websocket-client.
783-
But we are only excluding jetty-client not jetty-xml because HttpServer2 implicitly uses the shaded package name.
784-
-->
782+
<!-- Jetty 9.4.x: jetty-client and jetty-xml are depended by org.eclipse.jetty.websocket:websocket-client.-->
785783
<filter>
786784
<artifact>org.eclipse.jetty:jetty-client</artifact>
787785
<excludes>
788786
<exclude>*/**</exclude>
789787
</excludes>
790788
</filter>
789+
<filter>
790+
<artifact>org.eclipse.jetty:jetty-xml</artifact>
791+
<excludes>
792+
<exclude>*/**</exclude>
793+
</excludes>
794+
</filter>
795+
<filter>
796+
<artifact>org.eclipse.jetty:jetty-http</artifact>
797+
<excludes>
798+
<exclude>*/**</exclude>
799+
</excludes>
800+
</filter>
791801
</filters>
792802

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

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@
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:jetty-client</exclude>
162-
<exclude>org.eclipse.jetty:jetty-http</exclude>
163161
<!-- Leave bouncycastle unshaded because it's signed with a special Oracle certificate so it can be a custom JCE security provider -->
164162
<exclude>org.bouncycastle:*</exclude>
165163
</excludes>
@@ -208,6 +206,13 @@
208206
<exclude>about.html</exclude>
209207
</excludes>
210208
</filter>
209+
<filter>
210+
<!-- skip jetty license info already incorporated into LICENSE/NOTICE -->
211+
<artifact>org.eclipse.jetty.websocket:*</artifact>
212+
<excludes>
213+
<exclude>about.html</exclude>
214+
</excludes>
215+
</filter>
211216
<filter>
212217
<!-- skip docs on formats used in kerby -->
213218
<artifact>org.apache.kerby:kerb-util</artifact>

0 commit comments

Comments
 (0)