You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2018/05/26 11:12:55 UTC
groovy git commit: GROOVY-8592: Migrate command line tools to picocli
version of CliBuilder (revert some of the cleanup for 2_5_X)
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 581ed3e70 -> b5f66232f
GROOVY-8592: Migrate command line tools to picocli version of CliBuilder (revert some of the cleanup for 2_5_X)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b5f66232
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b5f66232
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b5f66232
Branch: refs/heads/GROOVY_2_5_X
Commit: b5f66232fe2809f00c4b7c9b96fd4771a642c3ff
Parents: 581ed3e
Author: Paul King <pa...@asert.com.au>
Authored: Sat May 26 21:12:41 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Sat May 26 21:12:41 2018 +1000
----------------------------------------------------------------------
build.gradle | 1 +
gradle/assemble.gradle | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/b5f66232/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 25e174c..bf0ae60 100644
--- a/build.gradle
+++ b/build.gradle
@@ -177,6 +177,7 @@ dependencies {
compile "org.ow2.asm:asm-tree:$asmVersion"
compile "org.ow2.asm:asm-util:$asmVersion"
+ compile "commons-cli:commons-cli:$commonsCliVersion" // keep in 2_5_X for deprecated methods in FSF
compile "info.picocli:picocli:$picocliVersion"
compile "org.apache.ant:ant:$antVersion"
compile("com.thoughtworks.xstream:xstream:$xstreamVersion") {
http://git-wip-us.apache.org/repos/asf/groovy/blob/b5f66232/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index b48742b..e8fa670 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -193,7 +193,8 @@ allprojects {
if (component instanceof ModuleComponentIdentifier) {
return component.module in [
'antlr', 'antlr-runtime', 'antlr4', 'antlr4-runtime', 'antlr4-annotations',
- 'asm', 'asm-commons', 'asm-tree', 'asm-util', 'picocli']
+ 'asm', 'asm-commons', 'asm-tree', 'asm-util',
+ 'commons-cli', 'picocli']
}
return false
}
@@ -203,6 +204,10 @@ allprojects {
}
jarjarToolClasspath = rootProject.configurations.tools
untouchedFiles = [
+ 'groovy/util/CliBuilder*.class',
+ 'groovy/util/OptionAccessor*.class',
+ 'groovy/cli/commons/CliBuilder*.class',
+ 'groovy/cli/commons/OptionAccessor*.class',
'groovy/cli/picocli/CliBuilder*.class',
'groovy/cli/picocli/OptionAccessor*.class'
]
@@ -210,6 +215,7 @@ allprojects {
'antlr.**' : 'groovyjarjarantlr.@1', // antlr2
'org.antlr.**' : 'groovyjarjarantlr4.@1', // antlr4
'org.objectweb.**' : 'groovyjarjarasm.@1',
+ 'org.apache.commons.cli.**': 'groovyjarjarcommonscli.@1', // this is just for deprecated methods in FSF for 2_5_X!
'picocli.**' : 'groovyjarjarpicocli.@1'
]
excludesPerLibrary = [