diff --git a/hadoop-client-modules/hadoop-client-api/pom.xml b/hadoop-client-modules/hadoop-client-api/pom.xml
index 9342d535c5..de34a9a4c4 100644
--- a/hadoop-client-modules/hadoop-client-api/pom.xml
+++ b/hadoop-client-modules/hadoop-client-api/pom.xml
@@ -68,149 +68,179 @@
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- true
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
-
-
- org.apache.hadoop
- hadoop-maven-plugins
- ${project.version}
-
-
-
-
- package
-
- shade
-
-
-
-
- org.apache.hadoop:*
-
-
-
-
-
- org.apache.hadoop:hadoop-yarn-common
-
- org/apache/hadoop/yarn/factories/package-info.class
- org/apache/hadoop/yarn/util/package-info.class
- org/apache/hadoop/yarn/factory/providers/package-info.class
- org/apache/hadoop/yarn/client/api/impl/package-info.class
- org/apache/hadoop/yarn/client/api/package-info.class
-
-
-
-
-
- org/
- ${shaded.dependency.prefix}.org.
-
- org/apache/hadoop/*
- org/apache/hadoop/**/*
-
- org/apache/htrace/*
- org/apache/htrace/**/*
- org/slf4j/*
- org/slf4j/**/*
- org/apache/commons/logging/*
- org/apache/commons/logging/**/*
- org/apache/log4j/*
- org/apache/log4j/**/*
- **/pom.xml
-
- org/ietf/jgss/*
- org/omg/**/*
- org/w3c/dom/*
- org/w3c/dom/**/*
- org/xml/sax/*
- org/xml/sax/**/*
-
-
-
- com/
- ${shaded.dependency.prefix}.com.
-
- **/pom.xml
-
- com/sun/tools/*
- com/sun/javadoc/*
- com/sun/security/*
- com/sun/jndi/*
- com/sun/management/*
- com/sun/tools/**/*
- com/sun/javadoc/**/*
- com/sun/security/**/*
- com/sun/jndi/**/*
- com/sun/management/**/*
-
-
-
- io/
- ${shaded.dependency.prefix}.io.
-
- **/pom.xml
-
- io/compression/*
- io/compression/**/*
- io/mapfile/*
- io/mapfile/**/*
- io/map/index/*
- io/seqfile/*
- io/seqfile/**/*
- io/file/buffer/size
- io/skip/checksum/errors
- io/sort/*
- io/serializations
-
-
-
- javax/servlet/
- ${shaded.dependency.prefix}.javax.servlet.
-
- **/pom.xml
-
-
-
- net/
- ${shaded.dependency.prefix}.net.
-
- **/pom.xml
-
- net/topology/*
- net/topology/**/*
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
- org.codehaus.mojo
- license-maven-plugin
-
-
-
+
+
+ shade
+
+ !skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ org.apache.hadoop
+ hadoop-maven-plugins
+ ${project.version}
+
+
+
+
+ package
+
+ shade
+
+
+
+
+ org.apache.hadoop:*
+
+
+
+
+
+ org.apache.hadoop:hadoop-yarn-common
+
+ org/apache/hadoop/yarn/factories/package-info.class
+ org/apache/hadoop/yarn/util/package-info.class
+ org/apache/hadoop/yarn/factory/providers/package-info.class
+ org/apache/hadoop/yarn/client/api/impl/package-info.class
+ org/apache/hadoop/yarn/client/api/package-info.class
+
+
+
+
+
+ org/
+ ${shaded.dependency.prefix}.org.
+
+ org/apache/hadoop/*
+ org/apache/hadoop/**/*
+
+ org/apache/htrace/*
+ org/apache/htrace/**/*
+ org/slf4j/*
+ org/slf4j/**/*
+ org/apache/commons/logging/*
+ org/apache/commons/logging/**/*
+ org/apache/log4j/*
+ org/apache/log4j/**/*
+ **/pom.xml
+
+ org/ietf/jgss/*
+ org/omg/**/*
+ org/w3c/dom/*
+ org/w3c/dom/**/*
+ org/xml/sax/*
+ org/xml/sax/**/*
+
+
+
+ com/
+ ${shaded.dependency.prefix}.com.
+
+ **/pom.xml
+
+ com/sun/tools/*
+ com/sun/javadoc/*
+ com/sun/security/*
+ com/sun/jndi/*
+ com/sun/management/*
+ com/sun/tools/**/*
+ com/sun/javadoc/**/*
+ com/sun/security/**/*
+ com/sun/jndi/**/*
+ com/sun/management/**/*
+
+
+
+ io/
+ ${shaded.dependency.prefix}.io.
+
+ **/pom.xml
+
+ io/compression/*
+ io/compression/**/*
+ io/mapfile/*
+ io/mapfile/**/*
+ io/map/index/*
+ io/seqfile/*
+ io/seqfile/**/*
+ io/file/buffer/size
+ io/skip/checksum/errors
+ io/sort/*
+ io/serializations
+
+
+
+ javax/servlet/
+ ${shaded.dependency.prefix}.javax.servlet.
+
+ **/pom.xml
+
+
+
+ net/
+ ${shaded.dependency.prefix}.net.
+
+ **/pom.xml
+
+ net/topology/*
+ net/topology/**/*
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+
+ noshade
+
+ skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+
diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
index 0df6776493..76f73944b8 100644
--- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
+++ b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
@@ -32,21 +32,6 @@
-
- org.apache.hadoop
- hadoop-client-api
- test
-
-
- org.apache.hadoop
- hadoop-client-runtime
- test
-
-
- org.apache.hadoop
- hadoop-client-minicluster
- test
-
log4j
log4j
@@ -68,63 +53,107 @@
test
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
-
- default-testCompile
- test-compile
-
-
- **/IT*
- **/*IT
-
-
-
-
-
- compile-integration-tests
- pre-integration-test
-
- testCompile
-
-
-
- **/IT*
- **/*IT
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
-
- integration-test
- verify
-
-
-
-
-
-
+
+
+ shade
+
+ !skipShade
+
+
+
+ org.apache.hadoop
+ hadoop-client-api
+ test
+
+
+ org.apache.hadoop
+ hadoop-client-runtime
+ test
+
+
+ org.apache.hadoop
+ hadoop-client-minicluster
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+
+ default-testCompile
+ test-compile
+
+
+ **/IT*
+ **/*IT
+
+
+
+
+
+ compile-integration-tests
+ pre-integration-test
+
+ testCompile
+
+
+
+ **/IT*
+ **/*IT
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+
+
+
+ noshade
+
+ skipShade
+
+
+
+ org.apache.hadoop
+ hadoop-common
+ test
+
+
+ org.apache.hadoop
+ hadoop-hdfs
+ test
+ test-jar
+
+
+
+
diff --git a/hadoop-client-modules/hadoop-client-minicluster/pom.xml b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
index 8ab70d8cfb..dd5f337f61 100644
--- a/hadoop-client-modules/hadoop-client-minicluster/pom.xml
+++ b/hadoop-client-modules/hadoop-client-minicluster/pom.xml
@@ -542,204 +542,234 @@
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- true
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
-
-
- org.apache.hadoop
- hadoop-maven-plugins
- ${project.version}
-
-
-
-
- package
-
- shade
-
-
- true
-
-
-
- org.apache.hadoop:hadoop-annotations
- org.apache.hadoop:hadoop-client-api
- org.apache.hadoop:hadoop-client-runtime
-
- org.apache.htrace:htrace-core4
- org.slf4j:slf4j-api
- commons-logging:commons-logging
- junit:junit
-
- org.apache.hadoop:hadoop-yarn-server-timelineservice
- log4j:log4j
-
-
-
-
-
-
- *:*
-
- **/*.java
-
-
-
-
- *:*
-
- **/Test*.class
-
-
-
-
- com.sun.jersey:jersey-client
-
- **/*.class
-
-
-
- com.sun.jersey:jersey-core
-
- **/*.class
-
-
-
- com.sun.jersey:jersey-servlet
-
- **/*.class
-
-
-
-
-
- org/
- ${shaded.dependency.prefix}.org.
-
- org/apache/hadoop/*
- org/apache/hadoop/**/*
-
- org/apache/htrace/*
- org/apache/htrace/**/*
- org/slf4j/*
- org/slf4j/**/*
- org/apache/commons/logging/*
- org/apache/commons/logging/**/*
- org/apache/log4j/*
- org/apache/log4j/**/*
- **/pom.xml
-
- org/junit/*
- org/junit/**/*
-
- org/ietf/jgss/*
- org/omg/**/*
- org/w3c/dom/*
- org/w3c/dom/**/*
- org/xml/sax/*
- org/xml/sax/**/*
-
-
-
- com/
- ${shaded.dependency.prefix}.com.
-
- **/pom.xml
-
- com/sun/tools/*
- com/sun/javadoc/*
- com/sun/security/*
- com/sun/jndi/*
- com/sun/management/*
- com/sun/tools/**/*
- com/sun/javadoc/**/*
- com/sun/security/**/*
- com/sun/jndi/**/*
- com/sun/management/**/*
-
-
-
- io/
- ${shaded.dependency.prefix}.io.
-
- **/pom.xml
-
- io/compression/*
- io/compression/**/*
- io/mapfile/*
- io/mapfile/**/*
- io/map/index/*
- io/seqfile/*
- io/seqfile/**/*
- io/file/buffer/size
- io/skip/checksum/errors
- io/sort/*
- io/serializations
-
-
-
- javax/el/
- ${shaded.dependency.prefix}.javax.el.
-
- **/pom.xml
-
-
-
- javax/inject/
- ${shaded.dependency.prefix}.javax.inject.
-
- **/pom.xml
-
-
-
- javax/servlet/
- ${shaded.dependency.prefix}.javax.servlet.
-
- **/pom.xml
-
-
-
- net/
- ${shaded.dependency.prefix}.net.
-
- **/pom.xml
-
- net/topology/*
- net/topology/**/*
-
-
-
-
-
-
-
-
- false
-
-
-
-
-
-
-
- org.codehaus.mojo
- license-maven-plugin
-
-
-
+
+
+ shade
+
+ !skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ org.apache.hadoop
+ hadoop-maven-plugins
+ ${project.version}
+
+
+
+
+ package
+
+ shade
+
+
+ true
+
+
+
+ org.apache.hadoop:hadoop-annotations
+ org.apache.hadoop:hadoop-client-api
+ org.apache.hadoop:hadoop-client-runtime
+
+ org.apache.htrace:htrace-core4
+ org.slf4j:slf4j-api
+ commons-logging:commons-logging
+ junit:junit
+
+ org.apache.hadoop:hadoop-yarn-server-timelineservice
+ log4j:log4j
+
+
+
+
+
+
+ *:*
+
+ **/*.java
+
+
+
+
+ *:*
+
+ **/Test*.class
+
+
+
+
+ com.sun.jersey:jersey-client
+
+ **/*.class
+
+
+
+ com.sun.jersey:jersey-core
+
+ **/*.class
+
+
+
+ com.sun.jersey:jersey-servlet
+
+ **/*.class
+
+
+
+
+
+ org/
+ ${shaded.dependency.prefix}.org.
+
+ org/apache/hadoop/*
+ org/apache/hadoop/**/*
+
+ org/apache/htrace/*
+ org/apache/htrace/**/*
+ org/slf4j/*
+ org/slf4j/**/*
+ org/apache/commons/logging/*
+ org/apache/commons/logging/**/*
+ org/apache/log4j/*
+ org/apache/log4j/**/*
+ **/pom.xml
+
+ org/junit/*
+ org/junit/**/*
+
+ org/ietf/jgss/*
+ org/omg/**/*
+ org/w3c/dom/*
+ org/w3c/dom/**/*
+ org/xml/sax/*
+ org/xml/sax/**/*
+
+
+
+ com/
+ ${shaded.dependency.prefix}.com.
+
+ **/pom.xml
+
+ com/sun/tools/*
+ com/sun/javadoc/*
+ com/sun/security/*
+ com/sun/jndi/*
+ com/sun/management/*
+ com/sun/tools/**/*
+ com/sun/javadoc/**/*
+ com/sun/security/**/*
+ com/sun/jndi/**/*
+ com/sun/management/**/*
+
+
+
+ io/
+ ${shaded.dependency.prefix}.io.
+
+ **/pom.xml
+
+ io/compression/*
+ io/compression/**/*
+ io/mapfile/*
+ io/mapfile/**/*
+ io/map/index/*
+ io/seqfile/*
+ io/seqfile/**/*
+ io/file/buffer/size
+ io/skip/checksum/errors
+ io/sort/*
+ io/serializations
+
+
+
+ javax/el/
+ ${shaded.dependency.prefix}.javax.el.
+
+ **/pom.xml
+
+
+
+ javax/inject/
+ ${shaded.dependency.prefix}.javax.inject.
+
+ **/pom.xml
+
+
+
+ javax/servlet/
+ ${shaded.dependency.prefix}.javax.servlet.
+
+ **/pom.xml
+
+
+
+ net/
+ ${shaded.dependency.prefix}.net.
+
+ **/pom.xml
+
+ net/topology/*
+ net/topology/**/*
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+
+ noshade
+
+ skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+
diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml
index aa1a54bb25..63250f8f96 100644
--- a/hadoop-client-modules/hadoop-client-runtime/pom.xml
+++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml
@@ -105,214 +105,244 @@
true
-
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
-
- true
-
-
-
- org.apache.maven.plugins
- maven-shade-plugin
-
-
- org.apache.hadoop
- hadoop-maven-plugins
- ${project.version}
-
-
-
-
- package
-
- shade
-
-
- true
-
-
-
- org.apache.hadoop:hadoop-client-api
-
- org.apache.htrace:htrace-core4
-
- org.slf4j:slf4j-api
-
- commons-logging:commons-logging
-
- log4j:log4j
-
-
-
-
-
- org.apache.hadoop:*
-
- **/*
- *
-
-
-
-
- *:*
-
- **/*.java
-
-
-
-
- tomcat:jasper-compiler
-
- org/apache/jasper/compiler/Localizer.class
-
-
-
-
- xerces:xercesImpl
-
- META-INF/services/*
-
-
-
-
- com.sun.jersey:*
-
- META-INF/services/javax.*
-
-
-
-
-
- org/
- ${shaded.dependency.prefix}.org.
-
- org/apache/hadoop/*
- org/apache/hadoop/**/*
-
- org/apache/htrace/*
- org/apache/htrace/**/*
- org/slf4j/*
- org/slf4j/**/*
- org/apache/commons/logging/*
- org/apache/commons/logging/**/*
- org/apache/log4j/*
- org/apache/log4j/**/*
- **/pom.xml
-
- org/ietf/jgss/*
- org/omg/**/*
- org/w3c/dom/*
- org/w3c/dom/**/*
- org/xml/sax/*
- org/xml/sax/**/*
-
-
-
- com/
- ${shaded.dependency.prefix}.com.
-
- **/pom.xml
-
- com/sun/tools/*
- com/sun/javadoc/*
- com/sun/security/*
- com/sun/jndi/*
- com/sun/management/*
- com/sun/tools/**/*
- com/sun/javadoc/**/*
- com/sun/security/**/*
- com/sun/jndi/**/*
- com/sun/management/**/*
-
-
-
- io/
- ${shaded.dependency.prefix}.io.
-
- **/pom.xml
-
- io/compression/*
- io/compression/**/*
- io/mapfile/*
- io/mapfile/**/*
- io/map/index/*
- io/seqfile/*
- io/seqfile/**/*
- io/file/buffer/size
- io/skip/checksum/errors
- io/sort/*
- io/serializations
-
-
-
- javax/el/
- ${shaded.dependency.prefix}.javax.el.
-
- **/pom.xml
-
-
-
- javax/servlet/
- ${shaded.dependency.prefix}.javax.servlet.
-
- **/pom.xml
-
-
-
- net/
- ${shaded.dependency.prefix}.net.
-
- **/pom.xml
-
- net/topology/*
- net/topology/**/*
-
-
-
-
-
-
-
-
-
-
- false
-
-
- META-INF/jboss-beans.xml
-
-
-
- META-INF/mailcap.default
-
-
- META-INF/mimetypes.default
-
-
-
-
-
-
-
- org.codehaus.mojo
- license-maven-plugin
-
-
-
+
+
+ shade
+
+ !skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+
+
+ org.apache.hadoop
+ hadoop-maven-plugins
+ ${project.version}
+
+
+
+
+ package
+
+ shade
+
+
+ true
+
+
+
+ org.apache.hadoop:hadoop-client-api
+
+ org.apache.htrace:htrace-core4
+
+ org.slf4j:slf4j-api
+
+ commons-logging:commons-logging
+
+ log4j:log4j
+
+
+
+
+
+ org.apache.hadoop:*
+
+ **/*
+ *
+
+
+
+
+ *:*
+
+ **/*.java
+
+
+
+
+ tomcat:jasper-compiler
+
+ org/apache/jasper/compiler/Localizer.class
+
+
+
+
+ xerces:xercesImpl
+
+ META-INF/services/*
+
+
+
+
+ com.sun.jersey:*
+
+ META-INF/services/javax.*
+
+
+
+
+
+ org/
+ ${shaded.dependency.prefix}.org.
+
+ org/apache/hadoop/*
+ org/apache/hadoop/**/*
+
+ org/apache/htrace/*
+ org/apache/htrace/**/*
+ org/slf4j/*
+ org/slf4j/**/*
+ org/apache/commons/logging/*
+ org/apache/commons/logging/**/*
+ org/apache/log4j/*
+ org/apache/log4j/**/*
+ **/pom.xml
+
+ org/ietf/jgss/*
+ org/omg/**/*
+ org/w3c/dom/*
+ org/w3c/dom/**/*
+ org/xml/sax/*
+ org/xml/sax/**/*
+
+
+
+ com/
+ ${shaded.dependency.prefix}.com.
+
+ **/pom.xml
+
+ com/sun/tools/*
+ com/sun/javadoc/*
+ com/sun/security/*
+ com/sun/jndi/*
+ com/sun/management/*
+ com/sun/tools/**/*
+ com/sun/javadoc/**/*
+ com/sun/security/**/*
+ com/sun/jndi/**/*
+ com/sun/management/**/*
+
+
+
+ io/
+ ${shaded.dependency.prefix}.io.
+
+ **/pom.xml
+
+ io/compression/*
+ io/compression/**/*
+ io/mapfile/*
+ io/mapfile/**/*
+ io/map/index/*
+ io/seqfile/*
+ io/seqfile/**/*
+ io/file/buffer/size
+ io/skip/checksum/errors
+ io/sort/*
+ io/serializations
+
+
+
+ javax/el/
+ ${shaded.dependency.prefix}.javax.el.
+
+ **/pom.xml
+
+
+
+ javax/servlet/
+ ${shaded.dependency.prefix}.javax.servlet.
+
+ **/pom.xml
+
+
+
+ net/
+ ${shaded.dependency.prefix}.net.
+
+ **/pom.xml
+
+ net/topology/*
+ net/topology/**/*
+
+
+
+
+
+
+
+
+
+
+ false
+
+
+ META-INF/jboss-beans.xml
+
+
+
+ META-INF/mailcap.default
+
+
+ META-INF/mimetypes.default
+
+
+
+
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+
+ noshade
+
+ skipShade
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-source-plugin
+
+ true
+
+
+
+ org.codehaus.mojo
+ license-maven-plugin
+
+
+
+
+