You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by he...@apache.org on 2020/10/30 09:08:45 UTC
[hadoop] 17/17: YARN-10472. Backport YARN-10314. YarnClient throws
NoClassDefFoundError for WebSocketException with only shaded client jars
(#2412)
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao pushed a commit to branch branch-3.2.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git
commit fe53f581842b86dee0f5d864085e7368af3e0222
Author: Siyao Meng <50...@users.noreply.github.com>
AuthorDate: Thu Oct 29 16:17:07 2020 -0700
YARN-10472. Backport YARN-10314. YarnClient throws NoClassDefFoundError for WebSocketException with only shaded client jars (#2412)
---
hadoop-client-modules/hadoop-client-minicluster/pom.xml | 10 +++++++---
hadoop-client-modules/hadoop-client-runtime/pom.xml | 9 +++++++--
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 9ef260b..780ae0c 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -779,15 +779,19 @@
<exclude>ehcache-core.xsd</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>
</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 b252a24..01c781c 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -158,8 +158,6 @@
<!-- 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:jetty-client</exclude>
- <exclude>org.eclipse.jetty:jetty-http</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>
</excludes>
@@ -209,6 +207,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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org