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 su...@apache.org on 2021/09/16 17:12:57 UTC

[hadoop] branch branch-3.3 updated: HADOOP-17891. Fix compilation error under skipShade (ADDENDUM) (#3441)

This is an automated email from the ASF dual-hosted git repository.

sunchao 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 103ef9c  HADOOP-17891. Fix compilation error under skipShade (ADDENDUM) (#3441)
103ef9c is described below

commit 103ef9c711af42974ff80f258d5abd55427320f2
Author: Liang-Chi Hsieh <vi...@gmail.com>
AuthorDate: Thu Sep 16 09:58:28 2021 -0700

    HADOOP-17891. Fix compilation error under skipShade (ADDENDUM) (#3441)
---
 dev-support/bin/hadoop.sh                                     | 2 +-
 hadoop-client-modules/hadoop-client-integration-tests/pom.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-support/bin/hadoop.sh b/dev-support/bin/hadoop.sh
index 526b9d5..7835b75 100755
--- a/dev-support/bin/hadoop.sh
+++ b/dev-support/bin/hadoop.sh
@@ -557,7 +557,7 @@ function shadedclient_rebuild
   echo_and_redirect "${logfile}" \
     "${MAVEN}" "${MAVEN_ARGS[@]}" verify -fae --batch-mode -am \
       "${modules[@]}" \
-      -Pnoshade -Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true
+      -DskipShade -Dtest=NoUnitTests -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dspotbugs.skip=true
 
   count=$("${GREP}" -c '\[ERROR\]' "${logfile}")
   if [[ ${count} -gt 0 ]]; then
diff --git a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
index 350c903..d7c84e0 100644
--- a/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
+++ b/hadoop-client-modules/hadoop-client-integration-tests/pom.xml
@@ -191,6 +191,12 @@
           <scope>test</scope>
           <type>test-jar</type>
         </dependency>
+        <dependency>
+          <groupId>org.apache.hadoop</groupId>
+          <artifactId>hadoop-common</artifactId>
+          <scope>test</scope>
+          <type>test-jar</type>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org