groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: include antlr4 license when required
Date Thu, 14 Sep 2017 03:04:20 GMT
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 <paulk@asert.com.au>
Authored: Thu Sep 14 13:04:14 2017 +1000
Committer: paulk <paulk@asert.com.au>
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'


Mime
View raw message