hbase git commit: HBASE-14337 Improve test-patch to better deal with dependency licenses

[bu...@apache.org]

Repository: hbase
Updated Branches:
  refs/heads/HBASE-14337 [created] d0b00a6e3


HBASE-14337 Improve test-patch to better deal with dependency licenses

* if we know we're going to fail the build via velocity template failure, output the cause in the generated LICENSE file.
* tweak test-patch workspace handling to allow for checkout of repo next to patch process


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d0b00a6e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d0b00a6e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d0b00a6e

Branch: refs/heads/HBASE-14337
Commit: d0b00a6e37fffc434ed42ee01698c37f66aa60ef
Parents: df341c4
Author: Sean Busbey <bu...@cloudera.com>
Authored: Mon Aug 31 08:52:12 2015 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Mon Aug 31 09:42:17 2015 -0500

----------------------------------------------------------------------
 dev-support/test-patch.sh                             |  7 ++++++-
 .../src/main/resources/META-INF/LICENSE.vm            | 14 +++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d0b00a6e/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index 33f84c5..d3704bb 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -35,6 +35,7 @@ NEWLINE=$'\n'
 
 PROJECT_NAME=HBase
 JENKINS=false
+MOVE_PATCH_DIR=true
 PATCH_DIR=/tmp
 BASEDIR=$(pwd)
 BRANCH_NAME="master"
@@ -90,6 +91,9 @@ parseArgs() {
     --jenkins)
       JENKINS=true
       ;;
+    --no-move-patch-dir)
+      MOVE_PATCH_DIR=false
+      ;;
     --patch-dir=*)
       PATCH_DIR=${i#*=}
       ;;
@@ -1001,8 +1005,9 @@ $comment"
 ### Cleanup files
 cleanupAndExit () {
   local result=$1
-  if [[ $JENKINS == "true" ]] ; then
+  if [[ ${JENKINS} == "true" && ${MOVE_PATCH_DIR} == "true" ]] ; then
     if [ -e "$PATCH_DIR" ] ; then
+      echo "Relocating patch dir into ${BASEDIR}"
       mv $PATCH_DIR $BASEDIR
     fi
   fi

http://git-wip-us.apache.org/repos/asf/hbase/blob/d0b00a6e/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
----------------------------------------------------------------------
diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index d00b17c..54f53fd 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1560,13 +1560,21 @@ You can redistribute it and/or modify it under either the terms of the GPL
 #set($hadoop = false)
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
+## if there are no licenses we'll fail the build later, so
+## make sure we output something now that can be used to triage.
+#if(${dep.licenses.size()} == 0)
+No license info included; must update supplemental-models for:
+
+g:${dep.groupId} AND a:${dep.artifactId} AND v:${dep.version}
+
+Until hbase-resource-bundle/src/main/resources/supplemental-models.xml
+is updated, the build should fail.
+#end
 #if(${debug-print-included-work-info.equalsIgnoreCase("true")})
 =====
 Check license for included work
 
-#if(${dep.licenses.size()} == 0)
-No license info included; must update supplemental-models
-#else
+#if(${dep.licenses.size()} > 0)
 License short name: '${dep.licenses[0].name}'
 #end