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. 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..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 @@ -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/" 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.