From 7e8190ed3294078df8a423e6af1304118a963977 Mon Sep 17 00:00:00 2001
From: Mike Drob <mdrob@apache.org>
Date: Fri, 16 Jun 2017 20:31:32 -0500
Subject: [PATCH] HBASE-18230 Remove Velocity vars from LICENSE

Signed-off-by: Sean Busbey <busbey@apache.org>
---
 .../src/main/resources/META-INF/LICENSE.vm             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 e593f126ef0..f842d00c671 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1620,7 +1620,7 @@ ${empty[0]}
 This product includes the following works licensed under the MIT license:
 
 #foreach($dep in $mit)
-#if( !(${dep.licenses[0].comments.isEmpty()}) )
+#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
   * ${dep.name}, ${dep.licenses[0].comments}
 #else
   * ${dep.name}
@@ -1655,7 +1655,7 @@ THE SOFTWARE.
 This product includes the following works licensed under the BSD 3-Clause license:
 
 #foreach($dep in $bsd3)
-#if( !(${dep.licenses[0].comments.isEmpty()}) )
+#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
   * ${dep.name}, ${dep.licenses[0].comments}
 #else
   * ${dep.name}
@@ -1696,7 +1696,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 This product includes the following works licensed under the CDDL 1.0 license:
 
 #foreach($dep in $cddl_1_0)
-#if( !(${dep.licenses[0].comments.isEmpty()}) )
+#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
   * ${dep.name}, ${dep.licenses[0].comments}
 #else
   * ${dep.name}
@@ -1953,7 +1953,7 @@ the State of California, with venue lying in Santa Clara County, California.
 This product includes the following works licensed under the CDDL 1.1 license:
 
 #foreach($dep in $cddl_1_1)
-#if( !(${dep.licenses[0].comments.isEmpty()}) )
+#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
   * ${dep.name}, ${dep.licenses[0].comments}
 #else
   * ${dep.name}
@@ -2251,7 +2251,7 @@ the State of California, with venue lying in Santa Clara County, California.
 This product includes the following works licensed under the Common Public License Version 1.0:
 
 #foreach($dep in $cpl)
-#if( !(${dep.licenses[0].comments.isEmpty()}) )
+#if( $dep.licenses[0].comments && !$dep.licenses[0].comments.empty )
   * ${dep.name}, ${dep.licenses[0].comments}
 #else
   * ${dep.name}