Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2FD97200CBC for ; Tue, 20 Jun 2017 08:27:47 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2F5C7160BF6; Tue, 20 Jun 2017 06:27:47 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7517C160BE1 for ; Tue, 20 Jun 2017 08:27:46 +0200 (CEST) Received: (qmail 15881 invoked by uid 500); 20 Jun 2017 06:27:45 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 15864 invoked by uid 99); 20 Jun 2017 06:27:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Jun 2017 06:27:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D1F2E000B; Tue, 20 Jun 2017 06:27:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: busbey@apache.org To: commits@hbase.apache.org Date: Tue, 20 Jun 2017 06:27:45 -0000 Message-Id: <1bbc2400b89449d786feed037d40d4ca@git.apache.org> In-Reply-To: <17e95b57ffdf4c9b8ef18c708278ecd8@git.apache.org> References: <17e95b57ffdf4c9b8ef18c708278ecd8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/6] hbase git commit: HBASE-18230 Remove Velocity vars from LICENSE archived-at: Tue, 20 Jun 2017 06:27:47 -0000 HBASE-18230 Remove Velocity vars from LICENSE Signed-off-by: Sean Busbey Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/deb47d67 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/deb47d67 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/deb47d67 Branch: refs/heads/branch-2 Commit: deb47d677d4f95bfdbe57162cdddd8ace8beab10 Parents: 4aa7ce3 Author: Mike Drob Authored: Fri Jun 16 20:31:32 2017 -0500 Committer: Sean Busbey Committed: Tue Jun 20 01:11:03 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/deb47d67/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 e593f12..f842d00 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}