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/04/05 04:21:06 UTC
[2/3] groovy git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/groovy
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/groovy
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4f508a47
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4f508a47
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4f508a47
Branch: refs/heads/master
Commit: 4f508a47e2e81970f3b4573804e3b787c07dbd96
Parents: 8a94915 f535e89
Author: Paul King <pa...@asert.com.au>
Authored: Thu Apr 5 14:20:29 2018 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu Apr 5 14:20:29 2018 +1000
----------------------------------------------------------------------
src/antlr/GroovyParser.g4 | 6 +++---
.../groovy/ast/decompiled/AsmDecompiler.java | 8 +++-----
.../classgen/asm/sc/StaticTypesLambdaWriter.java | 7 ++++---
src/test/groovy/bugs/Groovy4252Bug.groovy | 2 +-
.../groovy/ant/FileSystemCompilerFacade.java | 2 +-
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 2 +-
.../tools/groovydoc/ExternalGroovyClassDoc.java | 2 +-
.../tools/groovydoc/SimpleGroovyClassDoc.java | 17 ++++++++---------
.../groovy/tools/groovydoc/SimpleGroovyDoc.java | 2 +-
.../groovydoc/SimpleGroovyExecutableMemberDoc.java | 2 +-
.../tools/groovydoc/SimpleGroovyPackageDoc.java | 14 +++++++-------
.../tools/groovydoc/SimpleGroovyParameter.java | 2 +-
.../groovydoc/SimpleGroovyProgramElementDoc.java | 2 +-
.../tools/groovydoc/SimpleGroovyRootDoc.java | 4 ++--
.../src/main/java/groovy/json/JsonBuilder.java | 5 ++---
.../src/main/java/groovy/json/JsonGenerator.java | 4 +---
.../apache/groovy/json/internal/MapItemValue.java | 2 --
.../main/java/groovy/sql/ExtractIndexAndSql.java | 2 +-
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 2 +-
.../src/main/java/groovy/model/ClosureModel.java | 2 +-
.../groovy/binding/ClosureTriggerBinding.java | 4 ++--
.../groovy/xml/streamingmarkupsupport/Builder.java | 1 -
.../apache/groovy/parser/antlr4/AstBuilder.java | 2 +-
23 files changed, 44 insertions(+), 52 deletions(-)
----------------------------------------------------------------------