This is an automated email from the ASF dual-hosted git repository.
vinayakumarb pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new c1ef247 YARN-10314. YarnClient throws NoClassDefFoundError for
WebSocketException with only shaded client jars (#2075)
c1ef247 is described below
commit c1ef247dc694097533a6bda4697f593deab2afb1
Author: Vinayakumar B <vinayakum...@apache.org>
AuthorDate: Wed Jun 17 09:26:41 2020 +0530
YARN-10314. YarnClient throws NoClassDefFoundError for WebSocketException
with only shaded client jars (#2075)
---
hadoop-client-modules/hadoop-client-minicluster/pom.xml | 16 +++++++++++++---
hadoop-client-modules/hadoop-client-runtime/pom.xml | 11 +++++++----
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 6c8bc21..48b6619 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -811,15 +811,25 @@
<exclude>*/**</exclude>
</excludes>
</filter>
- <!-- Jetty 9.4.x: jetty-client and jetty-xml are depended
by org.eclipse.jetty.websocket:websocket-client.
- But we are only excluding jetty-client not jetty-xml
because HttpServer2 implicitly uses the shaded package name.
- -->
+ <!-- Jetty 9.4.x: jetty-client and jetty-xml are depended
by org.eclipse.jetty.websocket:websocket-client.-->
<filter>
<artifact>org.eclipse.jetty:jetty-client</artifact>
<excludes>
<exclude>*/**</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>org.eclipse.jetty:jetty-xml</artifact>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.eclipse.jetty:jetty-http</artifact>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </filter>
</filters>
<!-- relocate classes from mssql-jdbc -->
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml
b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index 5e00f9f..80bd1ee 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -158,12 +158,8 @@
<!-- 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 :(
-->
<exclude>com.google.code.findbugs:jsr305</exclude>
<exclude>io.dropwizard.metrics:metrics-core</exclude>
- <exclude>org.eclipse.jetty.websocket:*</exclude>
<exclude>org.eclipse.jetty:jetty-servlet</exclude>
<exclude>org.eclipse.jetty:jetty-security</exclude>
- <exclude>org.eclipse.jetty:jetty-client</exclude>
- <exclude>org.eclipse.jetty:jetty-http</exclude>
- <exclude>org.eclipse.jetty:jetty-xml</exclude>
<exclude>org.ow2.asm:*</exclude>
<!-- Leave bouncycastle unshaded because it's signed
with a special Oracle certificate so it can be a custom JCE security provider
-->
<exclude>org.bouncycastle:*</exclude>
@@ -214,6 +210,13 @@
</excludes>
</filter>
<filter>
+ <!-- skip jetty license info already incorporated into
LICENSE/NOTICE -->
+ <artifact>org.eclipse.jetty.websocket:*</artifact>
+ <excludes>
+ <exclude>about.html</exclude>
+ </excludes>
+ </filter>
+ <filter>
<!-- skip docs on formats used in kerby -->
<artifact>org.apache.kerby:kerb-util</artifact>
<excludes>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
