Repository: hbase Updated Branches: refs/heads/branch-1 c6e587c5a -> dead08d66
HBASE-18230 Remove Velocity vars from LICENSE Signed-off-by: Sean Busbey <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f7b4f5c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f7b4f5c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f7b4f5c Branch: refs/heads/branch-1 Commit: 6f7b4f5c2cd08debefe85f5bb19f77a3f0448076 Parents: c6e587c Author: Mike Drob <[email protected]> Authored: Fri Jun 16 20:31:32 2017 -0500 Committer: Sean Busbey <[email protected]> Committed: Tue Jun 20 01:41:58 2017 -0500 ---------------------------------------------------------------------- .../src/main/resources/META-INF/LICENSE.vm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/6f7b4f5c/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 9f9afb5..2fa1b38 100644 --- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm +++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm @@ -1694,7 +1694,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} @@ -1729,7 +1729,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} @@ -1770,7 +1770,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} @@ -2027,7 +2027,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} @@ -2325,7 +2325,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}
