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 4066A200CFC for ; Thu, 14 Sep 2017 05:04:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3EF041609CB; Thu, 14 Sep 2017 03:04:23 +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 840BD1609CA for ; Thu, 14 Sep 2017 05:04:22 +0200 (CEST) Received: (qmail 5450 invoked by uid 500); 14 Sep 2017 03:04:21 -0000 Mailing-List: contact commits-help@groovy.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@groovy.apache.org Delivered-To: mailing list commits@groovy.apache.org Received: (qmail 5441 invoked by uid 99); 14 Sep 2017 03:04:21 -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; Thu, 14 Sep 2017 03:04:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B6312F56C3; Thu, 14 Sep 2017 03:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: paulk@apache.org To: commits@groovy.apache.org Message-Id: <0683f14cb3724cb2b40333257875d7a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: groovy git commit: include antlr4 license when required Date: Thu, 14 Sep 2017 03:04:20 +0000 (UTC) archived-at: Thu, 14 Sep 2017 03:04:23 -0000 Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X 207233955 -> 96b59cd61 include antlr4 license when required Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/96b59cd6 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/96b59cd6 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/96b59cd6 Branch: refs/heads/GROOVY_2_6_X Commit: 96b59cd61ee5b4993ad9dd53e4fa4953211d6985 Parents: 2072339 Author: paulk Authored: Thu Sep 14 13:04:14 2017 +1000 Committer: paulk Committed: Thu Sep 14 13:04:14 2017 +1000 ---------------------------------------------------------------------- gradle/assemble.gradle | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/96b59cd6/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index b6581c4..d34be8c 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -139,6 +139,9 @@ jar { into('licenses') include('asm-license.txt') include('antlr2-license.txt') + if (rootProject.hasProperty('useAntlr4')) { + include('antlr4-license.txt') + } } from("$projectDir/notices/NOTICE-JARJAR") from('src/resources/META-INF/groovy-release-info.properties') { @@ -554,6 +557,9 @@ ext.distSpec = copySpec { into('licenses') { from 'licenses' include 'antlr2-license.txt' + if (rootProject.hasProperty('useAntlr4')) { + include('antlr4-license.txt') + } include 'asm-license.txt' include 'hamcrest-license.txt' include 'jline2-license.txt'