[groovy] 01/03: Merge tag 'upstream/2.4.7'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Jun 21 09:43:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy.
commit eba8bc0e6915d7d579d6c76818f9a8c54f573894
Merge: 056ce6b eb45adf
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Jun 21 00:36:12 2016 +0200
Merge tag 'upstream/2.4.7'
Upstream version 2.4.7
.travis.yml | 31 ++
build.gradle | 2 +-
gradle.properties | 4 +-
gradle/binarycompatibility.gradle | 2 +-
gradle/docs.gradle | 4 +-
gradle/quality.gradle | 4 +-
gradle/test.gradle | 2 +-
gradle/wrapper.gradle | 2 +
.../groovy/beans/BindableASTTransformation.java | 2 +-
.../groovy/beans/VetoableASTTransformation.java | 2 +-
.../groovy/grape/GrabAnnotationTransformation.java | 4 +-
src/main/groovy/grape/GrapeIvy.groovy | 8 +-
src/main/groovy/lang/BenchmarkInterceptor.java | 4 +-
src/main/groovy/lang/Category.java | 4 +-
src/main/groovy/lang/Closure.java | 34 +-
src/main/groovy/lang/Delegate.java | 2 +-
src/main/groovy/lang/DelegatingMetaClass.java | 1 +
src/main/groovy/lang/GroovyClassLoader.java | 12 +-
src/main/groovy/lang/GroovyCodeSource.java | 2 +-
src/main/groovy/lang/GroovyShell.java | 6 +-
src/main/groovy/lang/GroovySystem.java | 4 -
src/main/groovy/lang/ListWithDefault.java | 2 +-
src/main/groovy/lang/MetaClassImpl.java | 61 +--
src/main/groovy/lang/MetaClassRegistry.java | 4 +-
src/main/groovy/lang/MetaMethod.java | 28 +-
src/main/groovy/lang/ParameterArray.java | 2 +-
src/main/groovy/lang/ProxyMetaClass.java | 8 +-
src/main/groovy/lang/TracingInterceptor.java | 2 +-
src/main/groovy/time/TimeCategory.java | 4 +-
src/main/groovy/transform/ASTTest.java | 2 +-
src/main/groovy/transform/AnnotationCollector.java | 100 ++++-
src/main/groovy/transform/BaseScript.java | 56 +++
src/main/groovy/transform/CompileStatic.java | 2 +-
src/main/groovy/transform/EqualsAndHashCode.java | 34 +-
src/main/groovy/transform/Field.java | 3 +-
src/main/groovy/transform/Immutable.java | 50 ++-
src/main/groovy/transform/IndexedProperty.java | 33 ++
src/main/groovy/transform/InheritConstructors.java | 39 +-
src/main/groovy/transform/Memoized.java | 39 ++
src/main/groovy/transform/SelfType.java | 2 +-
src/main/groovy/transform/Sortable.java | 77 ++++
src/main/groovy/transform/SourceURI.java | 2 +-
src/main/groovy/transform/Synchronized.java | 50 +++
src/main/groovy/transform/TailRecursive.groovy | 21 +-
src/main/groovy/transform/ToString.java | 160 +++++++-
src/main/groovy/transform/TupleConstructor.java | 101 ++++-
.../groovy/transform/builder/DefaultStrategy.java | 22 +-
.../groovy/transform/builder/ExternalStrategy.java | 2 +-
.../transform/builder/InitializerStrategy.java | 10 +-
.../groovy/transform/builder/SimpleStrategy.java | 2 +-
.../transform/stc/FromAbstractTypeMethods.java | 4 +-
src/main/groovy/ui/GroovyMain.java | 1 +
src/main/groovy/ui/GroovySocketServer.java | 2 +-
src/main/groovy/util/ConfigObject.java | 6 +-
src/main/groovy/util/Eval.java | 26 +-
src/main/groovy/util/GroovyScriptEngine.java | 9 +-
src/main/groovy/util/Node.java | 4 +-
src/main/groovy/util/ObjectGraphBuilder.java | 2 +-
src/main/groovy/util/ObservableList.java | 81 ++--
src/main/groovy/util/ObservableSet.java | 4 +
.../groovy/antlr/AntlrASTProcessSnippets.java | 1 -
.../codehaus/groovy/antlr/AntlrParserPlugin.java | 30 +-
src/main/org/codehaus/groovy/antlr/groovy.g | 6 +-
.../org/codehaus/groovy/antlr/java/Groovifier.java | 2 -
.../groovy/antlr/java/Java2GroovyConverter.java | 10 +-
.../groovy/antlr/java/PreJava2GroovyConverter.java | 9 -
.../groovy/antlr/treewalker/CompositeVisitor.java | 2 -
.../groovy/antlr/treewalker/MindMapPrinter.java | 4 +-
.../groovy/antlr/treewalker/NodeAsHTMLPrinter.java | 4 +-
.../groovy/antlr/treewalker/SourcePrinter.java | 2 +-
src/main/org/codehaus/groovy/ast/ClassHelper.java | 1 -
src/main/org/codehaus/groovy/ast/ClassNode.java | 51 +--
src/main/org/codehaus/groovy/ast/FieldNode.java | 4 +-
src/main/org/codehaus/groovy/ast/PropertyNode.java | 7 +-
.../ast/builder/AstBuilderTransformation.java | 4 +-
.../groovy/ast/expr/DeclarationExpression.java | 2 +-
.../groovy/ast/expr/ElvisOperatorExpression.java | 2 +-
.../codehaus/groovy/ast/tools/ClassNodeUtils.java | 41 ++
.../codehaus/groovy/ast/tools/GenericsUtils.java | 4 +-
.../codehaus/groovy/ast/tools/ParameterUtils.java | 39 ++
.../groovy/classgen/AnnotationVisitor.java | 4 +-
.../groovy/classgen/AsmClassGenerator.java | 8 +-
.../groovy/classgen/ClassCompletionVerifier.java | 100 +++--
.../groovy/classgen/EnumCompletionVisitor.java | 4 +-
.../org/codehaus/groovy/classgen/EnumVisitor.java | 6 +-
.../codehaus/groovy/classgen/ExtendedVerifier.java | 27 +-
.../classgen/InnerClassCompletionVisitor.java | 10 +-
.../groovy/classgen/InnerClassVisitor.java | 2 +-
.../org/codehaus/groovy/classgen/ReturnAdder.java | 1 +
.../groovy/classgen/VariableScopeVisitor.java | 2 +-
.../org/codehaus/groovy/classgen/Verifier.java | 36 +-
.../classgen/asm/BinaryExpressionHelper.java | 4 -
.../asm/BinaryExpressionMultiTypeDispatcher.java | 9 +-
.../groovy/classgen/asm/BytecodeHelper.java | 8 +-
.../groovy/classgen/asm/ClosureWriter.java | 10 +-
.../codehaus/groovy/classgen/asm/CompileStack.java | 4 +-
.../groovy/classgen/asm/InvocationWriter.java | 2 +-
.../codehaus/groovy/classgen/asm/MopWriter.java | 2 +-
.../codehaus/groovy/classgen/asm/OperandStack.java | 12 +-
.../classgen/asm/OptimizingStatementWriter.java | 18 +-
.../classgen/asm/indy/InvokeDynamicWriter.java | 4 +-
.../classgen/asm/sc/StaticInvocationWriter.java | 25 +-
...icTypesBinaryExpressionMultiTypeDispatcher.java | 14 -
.../classgen/asm/sc/StaticTypesCallSiteWriter.java | 1 -
.../classgen/asm/sc/StaticTypesClosureWriter.java | 2 +-
.../groovy/control/AnnotationConstantsVisitor.java | 8 +-
.../codehaus/groovy/control/ClassNodeResolver.java | 6 +-
.../codehaus/groovy/control/CompilationUnit.java | 8 +-
.../groovy/control/CompilerConfiguration.java | 18 +-
.../codehaus/groovy/control/GenericsVisitor.java | 13 +-
.../codehaus/groovy/control/ResolveVisitor.java | 14 +-
.../org/codehaus/groovy/control/SourceUnit.java | 4 +-
.../groovy/control/StaticImportVisitor.java | 16 +-
.../codehaus/groovy/control/StaticVerifier.java | 2 +-
.../control/customizers/SecureASTCustomizer.java | 2 +-
.../builder/SourceAwareCustomizerFactory.java | 4 +-
.../codehaus/groovy/reflection/CachedMethod.java | 66 +--
.../org/codehaus/groovy/reflection/ClassInfo.java | 4 +-
.../groovy/reflection/GeneratedMetaMethod.java | 2 +-
.../groovy/reflection/MixinInMetaClass.java | 2 +-
.../codehaus/groovy/reflection/ParameterTypes.java | 8 +-
.../reflection/v7/GroovyClassValueJava7.java | 1 -
.../codehaus/groovy/runtime/ComposedClosure.java | 2 +-
.../codehaus/groovy/runtime/CurriedClosure.java | 9 +-
.../groovy/runtime/DefaultGroovyMethods.java | 41 +-
.../codehaus/groovy/runtime/MetaClassHelper.java | 21 +-
.../groovy/runtime/NumberAwareComparator.java | 1 +
.../groovy/runtime/ProxyGeneratorAdapter.java | 14 +-
.../groovy/runtime/StringGroovyMethods.java | 443 ++++++++++-----------
.../groovy/runtime/callsite/ConstructorSite.java | 2 -
.../groovy/runtime/m12n/SimpleExtensionModule.java | 2 +-
.../groovy/runtime/metaclass/ClosureMetaClass.java | 8 +-
.../runtime/metaclass/ConcurrentReaderHashMap.java | 4 +-
.../runtime/metaclass/MetaClassRegistryImpl.java | 3 +-
.../groovy/runtime/metaclass/MetaMethodIndex.java | 9 +-
.../metaclass/MethodSelectionException.java | 2 +-
.../groovy/runtime/powerassert/SourceText.java | 4 +-
.../org/codehaus/groovy/tools/DgmConverter.java | 2 +-
.../org/codehaus/groovy/tools/GrapeMain.groovy | 2 +-
.../codehaus/groovy/tools/LoaderConfiguration.java | 8 +-
.../codehaus/groovy/tools/gse/StringSetMap.java | 2 -
.../groovy/tools/javac/JavaStubGenerator.java | 39 +-
.../groovy/tools/javac/JavacJavaCompiler.java | 3 +-
src/main/org/codehaus/groovy/tools/shell/IO.java | 2 +-
.../codehaus/groovy/tools/shell/util/Logger.java | 8 +-
.../groovy/transform/NewifyASTTransformation.java | 1 +
.../transform/sc/StaticCompilationVisitor.java | 7 +-
.../transformers/BinaryExpressionTransformer.java | 8 +-
.../transformers/BooleanExpressionTransformer.java | 10 +-
.../sc/transformers/CastExpressionOptimizer.java | 2 +-
.../sc/transformers/CompareIdentityExpression.java | 5 +-
.../MethodCallExpressionTransformer.java | 4 +-
.../VariableExpressionTransformer.java | 4 +-
.../stc/AbstractTypeCheckingExtension.java | 2 +-
.../transform/stc/StaticTypeCheckingVisitor.java | 79 ++--
.../transform/stc/TraitTypeCheckingExtension.java | 4 +-
.../transform/trait/NAryOperationRewriter.java | 2 +-
.../groovy/transform/trait/TraitComposer.java | 43 +-
.../transform/trait/TraitReceiverTransformer.java | 7 +-
.../util/AbstractConcurrentDoubleKeyMap.java | 200 ----------
.../groovy/util/AbstractConcurrentMapBase.java | 5 +-
.../codehaus/groovy/util/CharSequenceReader.java | 170 ++++++++
.../codehaus/groovy/util/ComplexKeyHashMap.java | 5 +-
.../org/codehaus/groovy/util/DoubleKeyHashMap.java | 93 -----
src/main/org/codehaus/groovy/util/ListHashMap.java | 2 +-
.../codehaus/groovy/util/ManagedDoubleKeyMap.java | 118 ------
.../org/codehaus/groovy/util/ReferenceManager.java | 70 ++--
src/main/org/codehaus/groovy/util/ReleaseInfo.java | 3 -
.../org/codehaus/groovy/vmplugin/VMPlugin.java | 2 +-
.../org/codehaus/groovy/vmplugin/v5/Java5.java | 4 +-
.../codehaus/groovy/vmplugin/v7/IndyInterface.java | 4 +
src/spec/doc/core-closures.adoc | 2 +-
src/spec/doc/core-differences-java.adoc | 2 +-
src/spec/doc/core-domain-specific-languages.adoc | 66 ++-
src/spec/doc/core-metaprogramming.adoc | 102 ++---
src/spec/doc/core-program-structure.adoc | 4 +-
src/spec/doc/core-semantics.adoc | 2 +-
src/spec/doc/core-traits.adoc | 3 +-
src/spec/doc/style-guide.adoc | 2 +-
src/spec/test/ClassDesignASTTransformsTest.groovy | 8 +-
.../test/CodeGenerationASTTransformsTest.groovy | 50 +++
.../DeclarativeConcurrencyASTTransformsTest.groovy | 4 +-
.../test/MainJavadocAssertionTest.groovy | 20 +-
src/test/gls/annotations/AnnotationTest.groovy | 9 +
src/test/gls/enums/EnumTest.groovy | 15 +
src/test/gls/innerClass/InnerClassTest.groovy | 30 ++
.../groovy/AbstractClassAndInterfaceTest.groovy | 63 +++
.../groovy/GroovyCharSequenceMethodsTest.groovy | 93 ++---
src/test/groovy/GroovyClosureMethodsTest.groovy | 2 +-
src/test/groovy/GroovyMethodsTest.groovy | 49 +++
.../bugs/Groovy3948Bug.groovy} | 35 +-
src/test/groovy/bugs/Groovy7081Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy7620Bug.groovy | 59 +++
src/test/groovy/lang/PropertyMissingTest.groovy | 29 ++
src/test/groovy/operator/NegateListsTest.groovy | 13 +-
.../groovy/transform/stc/GenericsSTCTest.groovy | 15 +-
.../groovy/transform/stc/MethodCallsSTCTest.groovy | 46 +++
.../util/GroovyScriptEngineReloadingTest.groovy | 18 +-
src/test/groovy/util/ObservableListTest.groovy | 10 +-
.../Groovy7826Bug.java} | 32 +-
.../classgen/ClassCompletionVerifierTest.java | 9 +
.../classgen/asm/sc/BugsStaticCompileTest.groovy | 30 +-
.../groovy/control/CompilerConfigurationTest.java | 12 -
.../groovy/reflection/CachedMethodTest.groovy | 13 +-
.../codehaus/groovy/reflection/WeakMapTest.groovy | 55 ---
.../CircularLanguageReferenceTest.groovy | 33 ++
.../stubgenerator/PropertyUsageFromJavaTest.groovy | 33 ++
.../groovy/transform/NewifyTransformTest.groovy | 18 +
.../groovy/transform/traitx/Groovy7846Bug.groovy} | 46 ++-
.../groovy/util/ReferenceManagerTest.groovy | 17 +
.../main/java/org/codehaus/groovy/ant/Groovy.java | 10 -
.../org/codehaus/groovy/ant/UberCompileTask.java | 2 -
.../java/org/codehaus/groovy/ant/VerifyClass.java | 2 -
.../java/org/codehaus/groovy/bsf/GroovyEngine.java | 2 +-
.../ui/text/StructuredSyntaxDocumentFilter.java | 6 +-
.../codehaus/groovy/groovydoc/GroovyClassDoc.java | 3 -
.../org/codehaus/groovy/groovydoc/GroovyDoc.java | 6 -
.../groovy/groovydoc/GroovyDocErrorReporter.java | 3 -
.../groovydoc/GroovyExecutableMemberDoc.java | 4 -
.../codehaus/groovy/groovydoc/GroovyFieldDoc.java | 1 -
.../groovy/groovydoc/GroovyPackageDoc.java | 4 -
.../org/codehaus/groovy/groovydoc/GroovyType.java | 11 -
.../tools/groovydoc/ClasspathResourceManager.java | 2 +-
.../tools/groovydoc/GroovyDocTemplateEngine.java | 25 --
.../groovy/tools/groovydoc/GroovyDocTool.java | 8 +-
.../groovy/tools/groovydoc/GroovyDocWriter.java | 2 +-
.../tools/groovydoc/GroovyRootDocBuilder.java | 18 +-
.../groovy/tools/groovydoc/LinkArgument.java | 2 +-
.../SimpleGroovyAbstractableElementDoc.java | 4 +-
.../tools/groovydoc/SimpleGroovyClassDoc.java | 2 +-
.../groovydoc/SimpleGroovyClassDocAssembler.java | 21 +-
.../groovy-groovydoc/src/spec/doc/groovydoc.adoc | 4 +-
.../groovydoc/SimpleGroovyClassDocTests.groovy | 14 +-
.../test/resources/groovydoc/groovyDocTests.xml | 4 +-
.../groovy/tools/shell/commands/LoadCommand.groovy | 5 +-
.../tools/shell/commands/ClearCommand.properties | 2 +-
.../tools/shell/commands/DocCommand.properties | 2 +-
.../shell/commands/RegisterCommand.properties | 2 +-
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 10 +-
.../tools/shell/commands/LoadCommandTest.groovy | 6 +
.../src/test/resources/groovy7777script} | 13 +-
.../groovy/jmx/builder/JmxBuilderException.java | 2 +-
subprojects/groovy-jmx/src/spec/doc/jmx.adoc | 2 +-
subprojects/groovy-json/build.gradle | 1 +
.../src/main/java/groovy/json/JsonBuilder.java | 48 +--
.../src/main/java/groovy/json/JsonDelegate.java | 2 +-
.../src/main/java/groovy/json/JsonLexer.java | 3 -
.../src/main/java/groovy/json/JsonSlurper.java | 4 +-
.../main/java/groovy/json/JsonSlurperClassic.java | 4 +-
.../java/groovy/json/StreamingJsonBuilder.java | 2 +-
.../java/groovy/json/internal/BaseJsonParser.java | 17 +-
.../main/java/groovy/json/internal/CharBuf.java | 17 +-
.../groovy/json/internal/CharSequenceValue.java | 5 +-
.../main/java/groovy/json/internal/Charsets.java | 31 --
.../src/main/java/groovy/json/internal/Dates.java | 20 +-
.../java/groovy/json/internal/JsonFastParser.java | 10 +-
.../groovy/json/internal/JsonParserCharArray.java | 10 +-
.../java/groovy/json/internal/JsonParserLax.java | 36 +-
.../internal/JsonParserUsingCharacterSource.java | 4 +-
.../java/groovy/json/internal/LazyValueMap.java | 4 +-
.../java/groovy/json/internal/NumberValue.java | 21 +-
.../json/internal/ReaderCharacterSource.java | 6 +-
.../src/main/java/groovy/json/internal/Value.java | 2 +-
.../main/java/groovy/json/internal/ValueList.java | 6 +-
.../java/groovy/json/internal/ValueMapImpl.java | 2 +-
.../groovy/json/JsonJavadocAssertionTest.groovy} | 21 +-
.../groovy/groovy/json/JsonSlurperLaxTest.groovy | 19 +
.../groovy/jsr223/GroovyScriptEngineImpl.java | 17 +-
.../main/java/groovy/servlet/ServletBinding.java | 4 +-
.../main/java/groovy/servlet/TemplateServlet.java | 8 +-
.../src/main/java/groovy/sql/DataSet.java | 2 +-
.../main/java/groovy/sql/ExtractIndexAndSql.java | 2 +-
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 52 ++-
.../src/test/groovy/groovy/sql/SqlBatchTest.groovy | 34 ++
.../src/test/groovy/groovy/sql/SqlCallTest.groovy | 39 ++
.../java/groovy/inspect/swingui/TableSorter.java | 10 +-
.../codehaus/groovy/binding/PropertyBinding.java | 2 +-
.../groovy/binding/PropertyPathFullBinding.java | 2 +-
.../groovy/runtime/SwingGroovyMethods.java | 2 +-
.../groovy/groovy/mock/interceptor/MockFor.groovy | 8 +-
.../groovy/groovy/mock/interceptor/StubFor.groovy | 2 +-
.../groovy/util/JavadocAssertionTestBuilder.groovy | 7 +-
.../mock/interceptor/MockProxyMetaClass.java | 10 +-
.../test/GroovyTestJavadocAssertionTest.groovy} | 21 +-
.../src/main/groovy/groovy/xml/StaxBuilder.groovy | 9 +-
.../src/main/java/groovy/util/XmlNodePrinter.java | 2 +-
.../src/main/java/groovy/util/XmlParser.java | 4 +-
.../src/main/java/groovy/util/XmlSlurper.java | 8 +-
.../java/groovy/util/slurpersupport/Attribute.java | 2 +-
.../groovy/util/slurpersupport/GPathResult.java | 10 +-
.../src/main/java/groovy/xml/DOMBuilder.java | 2 +-
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../java/groovy/xml/NamespaceBuilderSupport.java | 2 +-
.../StreamingMarkupWriter.java | 2 +-
.../test/groovy/groovy/util/XmlSlurperTest.groovy | 17 +-
.../groovy/xml/XmlJavadocAssertionTest.groovy} | 21 +-
296 files changed, 3079 insertions(+), 2170 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy.git
More information about the pkg-java-commits
mailing list