From 819e1d739671bd19f41af9d0274deca54bcc2b1a Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Fri, 8 Sep 2017 14:50:30 -0500 Subject: [PATCH 1/2] HBASE-18760 Make hbase-shaded-check-invariants part of precommit --- dev-support/hbase-personality.sh | 44 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dev-support/hbase-personality.sh b/dev-support/hbase-personality.sh index 9f591b1..8730d5c 100755 --- a/dev-support/hbase-personality.sh +++ b/dev-support/hbase-personality.sh @@ -167,6 +167,50 @@ function personality_modules ################################################### +add_test_type shadedclient + + +function shadedclient_initialize +{ + yetus_debug "initializing shaded client checks." + maven_add_install shadedclient + add_test shadedclient +} + +function shadedclient_clean +{ + "${MAVEN}" "${MAVEN_ARGS[@]}" clean -fae -pl hbase_shaded/hbase-shaded-check-invariants -am -Prelease +} + +## @description test the shaded client artifacts +## @audience private +## @stability evolving +## @param repostatus +function shadedclient_rebuild +{ + local repostatus=$1 + local logfile="${PATCH_DIR}/${repostatus}-shadedclient.txt" + + big_console_header "Checking shaded client builds on ${repostatus}" + + echo_and_redirect "${logfile}" \ + "${MAVEN}" "${MAVEN_ARGS[@]}" clean verify -fae --batch-mode \ + -pl hbase-shaded/hbase-shaded-check-invariants -am \ + -Dtest=NoUnitTests -DHBasePatchProcess -Prelease \ + -Dmaven.javadoc.skip=true -Dcheckstyle.skip=true -Dfindbugs.skip=true + + count=$(${GREP} -c '\[ERROR\]' "${logfile}") + if [[ ${count} -gt 0 ]]; then + add_vote_table -1 shadedclient "${repostatus} has ${count} errors when building our shaded client artifacts." + return 1 + fi + + add_vote_table +1 shadedclient "${repostatus} has no errors when building our shaded client artifacts." + return 0 +} + +################################################### + add_test_type hadoopcheck ## @description hadoopcheck file filter -- 2.7.2 From 08739b52b815a8a38995f0ee988b171f0a25fcfd Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Sat, 9 Sep 2017 00:11:56 -0500 Subject: [PATCH 2/2] HBASE-18759 Fix hbase-shaded-check-invariants failure * relocate the commons-lang 2.y that comes in from hadoop * exclude some additional jetty / glassfish / javax.servlet from shaded mapreduce --- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 16 ++++++++++++++++ hbase-shaded/pom.xml | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 041ccfe..5d0f04d 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -84,6 +84,18 @@ + javax.servlet + javax.servlet-api + + + org.eclipse.jetty + jetty-http + + + org.eclipse.jetty + jetty-security + + org.eclipse.jetty jetty-server @@ -108,6 +120,10 @@ jetty-webapp + org.glassfish.web + javax.servlet.jsp + + org.glassfish.jersey.containers jersey-container-servlet-core diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml index 16361b7..b3b6e33 100644 --- a/hbase-shaded/pom.xml +++ b/hbase-shaded/pom.xml @@ -318,6 +318,10 @@ org.apache.hadoop.hbase.shaded.org.apache.commons.net + org.apache.commons.lang + org.apache.hadoop.hbase.shaded.org.apache.commons.lang + + org.apache.commons.lang3 org.apache.hadoop.hbase.shaded.org.apache.commons.lang3 -- 2.7.2