From f2567a8946defd72fe4b822ec7c1f1ca6c0f93d2 Mon Sep 17 00:00:00 2001 From: Kamal Sharma Date: Mon, 29 May 2023 12:56:40 +0530 Subject: [PATCH 1/4] Remove javax/servlet relocation --- hadoop-client-modules/hadoop-client-api/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml index b4b81011eb517..93977b0f029db 100644 --- a/hadoop-client-modules/hadoop-client-api/pom.xml +++ b/hadoop-client-modules/hadoop-client-api/pom.xml @@ -213,13 +213,6 @@ **/pom.xml - - javax/servlet/ - ${shaded.dependency.prefix}.javax.servlet. - - **/pom.xml - - javax/ws/ ${shaded.dependency.prefix}.javax.ws. From ec5e60d5426c2953dd48138af8879b46326f47db Mon Sep 17 00:00:00 2001 From: Kamal Sharma Date: Thu, 8 Jun 2023 20:44:19 +0530 Subject: [PATCH 2/4] Allow javax/servlet in hadoop client artifacts --- .../src/test/resources/ensure-jars-have-correct-contents.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index 2e927402d2542..5fb657a96ba85 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh @@ -69,6 +69,9 @@ allowed_expr+="|^krb5_udp-template.conf$" allowed_expr+="|^jetty-dir.css$" # Snappy java is native library. We cannot relocate it to under org/apache/hadoop. allowed_expr+="|^org/xerial/" +# Jetty checks if class isAssignableFrom javax.servlet.Filter +# throws exception due to relocation +allowed_expr+="|^javax/servlet/" allowed_expr+=")" declare -i bad_artifacts=0 From ef9defadf710531709f2a7a060d7373b3f792b5f Mon Sep 17 00:00:00 2001 From: Kamal Sharma Date: Thu, 8 Jun 2023 23:04:04 +0530 Subject: [PATCH 3/4] Change allowed_expr for javax.servlet --- .../src/test/resources/ensure-jars-have-correct-contents.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index 5fb657a96ba85..3032503e40a42 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh @@ -71,7 +71,7 @@ allowed_expr+="|^jetty-dir.css$" allowed_expr+="|^org/xerial/" # Jetty checks if class isAssignableFrom javax.servlet.Filter # throws exception due to relocation -allowed_expr+="|^javax/servlet/" +allowed_expr+="|^javax.servlet$" allowed_expr+=")" declare -i bad_artifacts=0 From df3b25828e6d0f0d11172a4bb0ccebcbf68f40c9 Mon Sep 17 00:00:00 2001 From: Kamal Sharma Date: Tue, 27 Jun 2023 10:16:58 +0530 Subject: [PATCH 4/4] Remove javax.servlet shading in client modules --- .../test/resources/ensure-jars-have-correct-contents.sh | 2 +- hadoop-client-modules/hadoop-client-minicluster/pom.xml | 7 ------- hadoop-client-modules/hadoop-client-runtime/pom.xml | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh index 3032503e40a42..a1b8c55fd9662 100644 --- a/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh +++ b/hadoop-client-modules/hadoop-client-check-invariants/src/test/resources/ensure-jars-have-correct-contents.sh @@ -71,7 +71,7 @@ allowed_expr+="|^jetty-dir.css$" allowed_expr+="|^org/xerial/" # Jetty checks if class isAssignableFrom javax.servlet.Filter # throws exception due to relocation -allowed_expr+="|^javax.servlet$" +allowed_expr+="|^javax/" allowed_expr+=")" declare -i bad_artifacts=0 diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml index 208345d5f5a53..14d2609c0517b 100644 --- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml +++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml @@ -990,13 +990,6 @@ **/pom.xml - - javax/servlet/ - ${shaded.dependency.prefix}.javax.servlet. - - **/pom.xml - - javax/ws/ ${shaded.dependency.prefix}.javax.ws. diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index d5185f0fffc41..ae00e25ff6c1a 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -335,13 +335,6 @@ **/pom.xml - - javax/servlet/ - ${shaded.dependency.prefix}.javax.servlet. - - **/pom.xml - - javax/activation/ ${shaded.dependency.prefix}.javax.activation.