[groovy2] 02/06: Merge tag 'upstream/2.4.6'
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon May 2 20:28:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository groovy2.
commit 190bf23eae1fbf316acdbde31b84ae0822c38246
Merge: 3666d14 476d75f
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon May 2 18:59:34 2016 +0200
Merge tag 'upstream/2.4.6'
Upstream version 2.4.6
DISCLAIMER | 8 -
NOTICE | 2 +-
README.adoc | 4 +-
config/checkstyle/checkstyle-report.groovy | 4 +-
config/codenarc/codenarc.groovy | 26 +-
gradle.properties | 4 +-
gradle/asciidoctor.gradle | 1 -
gradle/assemble.gradle | 8 -
gradle/docs.gradle | 6 +-
gradle/idea.gradle | 2 +-
gradle/pomconfigurer.gradle | 6 +-
gradle/test.gradle | 9 +-
gradle/utils.gradle | 16 +-
gradle/wrapper.gradle | 2 -
notices/NOTICE-ALLJARJAR | 2 +-
notices/NOTICE-BASE | 2 +-
notices/NOTICE-BINZIP | 2 +-
notices/NOTICE-GROOID | 2 +-
notices/NOTICE-GROOIDJARJAR | 2 +-
notices/NOTICE-JARJAR | 2 +-
notices/NOTICE-SDK | 2 +-
src/bin/startGroovy | 26 +-
src/examples/searchEngine/Indexer.groovy | 2 +-
src/examples/searchEngine/Searcher.groovy | 2 +-
.../swing/binding/caricature/JCaricature.java | 2 +-
.../groovy/grape/GrabAnnotationTransformation.java | 2 +-
src/main/groovy/grape/GrapeIvy.groovy | 10 +-
src/main/groovy/lang/Category.java | 18 +-
src/main/groovy/lang/DelegatesTo.java | 29 +-
src/main/groovy/lang/ExpandoMetaClass.java | 6 +-
src/main/groovy/lang/GroovyClassLoader.java | 6 +-
src/main/groovy/lang/GroovyShell.java | 12 +-
src/main/groovy/lang/IntRange.java | 45 -
src/main/groovy/lang/MetaClass.java | 6 +-
src/main/groovy/lang/MetaClassImpl.java | 29 +-
src/main/groovy/time/BaseDuration.java | 2 +-
src/main/groovy/transform/InheritConstructors.java | 1 +
src/main/groovy/transform/Memoized.java | 2 +-
src/main/groovy/transform/SourceURI.java | 2 +-
src/main/groovy/transform/TupleConstructor.java | 1 +
.../groovy/transform/builder/DefaultStrategy.java | 2 +-
src/main/groovy/util/BuilderSupport.java | 7 +-
src/main/groovy/util/ConfigObject.java | 2 +-
src/main/groovy/util/DelegatingScript.java | 6 +-
src/main/groovy/util/FactoryBuilderSupport.java | 8 +-
src/main/groovy/util/GroovyCollections.java | 2 +-
src/main/groovy/util/GroovyScriptEngine.java | 23 +-
src/main/groovy/util/ObservableList.java | 4 +-
src/main/groovy/util/ObservableMap.java | 2 +-
src/main/groovy/util/ObservableSet.java | 2 +-
.../codehaus/groovy/antlr/AntlrParserPlugin.java | 10 +-
src/main/org/codehaus/groovy/antlr/groovy.g | 6 +-
.../antlr/treewalker/SourceCodeTraversal.java | 2 +-
src/main/org/codehaus/groovy/ast/ClassNode.java | 10 +-
src/main/org/codehaus/groovy/ast/GenericsType.java | 2 +
.../org/codehaus/groovy/ast/VariableScope.java | 6 +-
.../groovy/ast/expr/DeclarationExpression.java | 2 +-
.../groovy/ast/expr/GStringExpression.java | 2 +-
.../codehaus/groovy/ast/tools/GeneralUtils.java | 17 +
.../groovy/classgen/AnnotationVisitor.java | 2 +-
.../groovy/classgen/EnumCompletionVisitor.java | 4 +-
.../org/codehaus/groovy/classgen/EnumVisitor.java | 2 +-
.../codehaus/groovy/classgen/ExtendedVerifier.java | 78 +-
.../org/codehaus/groovy/classgen/Verifier.java | 4 +-
.../groovy/classgen/asm/ClosureWriter.java | 6 +-
.../codehaus/groovy/classgen/asm/CompileStack.java | 4 +-
.../codehaus/groovy/classgen/asm/MopWriter.java | 2 +-
.../groovy/classgen/asm/StatementWriter.java | 9 +-
.../groovy/classgen/asm/WriterController.java | 2 +-
.../classgen/asm/indy/InvokeDynamicWriter.java | 2 +-
.../classgen/asm/sc/StaticInvocationWriter.java | 38 +-
...icTypesBinaryExpressionMultiTypeDispatcher.java | 57 +
.../classgen/asm/sc/StaticTypesCallSiteWriter.java | 2 +-
.../asm/sc/StaticTypesStatementWriter.java | 5 +-
.../codehaus/groovy/control/ClassNodeResolver.java | 2 +-
.../groovy/control/CompilerConfiguration.java | 15 +-
.../codehaus/groovy/control/ErrorCollector.java | 2 +-
.../codehaus/groovy/control/ResolveVisitor.java | 4 +-
.../builder/SecureASTCustomizerFactory.java | 1 +
.../codehaus/groovy/reflection/CachedClass.java | 3 +
.../groovy/reflection/CachedConstructor.java | 7 +-
.../groovy/reflection/GroovyClassValueFactory.java | 3 +-
.../reflection/stdclasses/CachedSAMClass.java | 8 +
.../codehaus/groovy/runtime/ConversionHandler.java | 44 +-
.../codehaus/groovy/runtime/ConvertedClosure.java | 5 +-
.../org/codehaus/groovy/runtime/ConvertedMap.java | 3 +
.../groovy/runtime/DefaultGroovyMethods.java | 48 +-
.../runtime/DefaultGroovyMethodsSupport.java | 2 +-
.../groovy/runtime/GroovyCategorySupport.java | 6 +-
.../codehaus/groovy/runtime/HandleMetaClass.java | 13 +-
.../org/codehaus/groovy/runtime/InvokerHelper.java | 18 +-
.../org/codehaus/groovy/runtime/NullObject.java | 2 +-
.../groovy/runtime/ProxyGeneratorAdapter.java | 12 +-
.../groovy/runtime/StringGroovyMethods.java | 2 +-
.../runtime/metaclass/MetaClassRegistryImpl.java | 2 +-
.../typehandling/DefaultTypeTransformation.java | 3 +-
.../codehaus/groovy/tools/FileSystemCompiler.java | 2 +-
.../tools/javac/JavaAwareCompilationUnit.java | 6 +-
.../groovy/tools/javac/JavaStubGenerator.java | 16 +-
.../codehaus/groovy/tools/shell/util/Logger.java | 8 +-
.../transform/AbstractASTTransformation.java | 2 +-
.../AbstractInterruptibleASTTransformation.java | 41 +-
.../transform/AnnotationCollectorTransform.java | 10 +-
.../transform/AutoCloneASTTransformation.java | 4 +-
.../ExternalizeMethodsASTTransformation.java | 8 +-
.../transform/ImmutableASTTransformation.java | 9 +-
.../transform/SingletonASTTransformation.java | 6 +-
.../TimedInterruptibleASTTransformation.groovy | 4 +-
.../TupleConstructorASTTransformation.java | 7 +-
.../sc/StaticCompilationMetadataKeys.java | 3 +-
.../transform/sc/StaticCompilationVisitor.java | 43 +-
.../transformers/BinaryExpressionTransformer.java | 2 +-
.../sc/transformers/CompareToNullExpression.java | 2 +-
.../MethodCallExpressionTransformer.java | 3 +-
.../VariableExpressionTransformer.java | 3 +
.../transform/stc/StaticTypeCheckingSupport.java | 252 +++--
.../transform/stc/StaticTypeCheckingVisitor.java | 96 +-
.../groovy/transform/stc/StaticTypesMarker.java | 1 +
.../groovy/transform/trait/TraitComposer.java | 2 +-
src/main/org/codehaus/groovy/util/ListHashMap.java | 38 +-
.../codehaus/groovy/util/ManagedConcurrentMap.java | 21 +-
.../groovy/util/ManagedConcurrentValueMap.java | 4 +-
.../codehaus/groovy/util/ManagedDoubleKeyMap.java | 11 +-
.../codehaus/groovy/util/ManagedLinkedList.java | 1 +
.../org/codehaus/groovy/util/ManagedReference.java | 2 +-
.../org/codehaus/groovy/util/ReferenceBundle.java | 2 +-
.../org/codehaus/groovy/util/ReferenceManager.java | 34 +-
.../org/codehaus/groovy/vmplugin/v5/Java5.java | 3 +
.../codehaus/groovy/vmplugin/v7/IndyInterface.java | 26 +-
.../org/codehaus/groovy/vmplugin/v7/Java7.java | 4 +
src/resources/groovy/grape/defaultGrapeConfig.xml | 1 -
.../assets/img/ChainOfResponsibilityClasses.gif | Bin
src/spec/{doc => }/assets/img/CompositeClasses.gif | Bin
.../{doc => }/assets/img/CompositeComponents.gif | Bin
src/spec/assets/img/GroovyInterceptions.png | Bin 35387 -> 18355 bytes
src/spec/{doc => }/assets/img/StrategyClasses.gif | Bin
.../{doc => }/assets/img/TemplateMethodClasses.gif | Bin
src/spec/{doc => }/assets/img/a380.jpg | Bin
src/spec/{doc => }/assets/img/b797-hoax.jpg | Bin
src/spec/{doc => }/assets/img/catalina.gif | Bin
src/spec/assets/img/console1.png | Bin 111912 -> 0 bytes
src/spec/assets/img/console2.png | Bin 95044 -> 0 bytes
src/spec/assets/img/console3.png | Bin 93569 -> 0 bytes
src/spec/assets/img/console5.png | Bin 68479 -> 0 bytes
src/spec/assets/img/console6.png | Bin 74437 -> 0 bytes
src/spec/assets/img/console7.png | Bin 70660 -> 0 bytes
src/spec/assets/img/example1.png | Bin 62930 -> 0 bytes
src/spec/assets/img/example10.png | Bin 82936 -> 0 bytes
src/spec/assets/img/example11.png | Bin 95471 -> 0 bytes
src/spec/assets/img/example12.png | Bin 64916 -> 0 bytes
src/spec/assets/img/example13.png | Bin 71409 -> 0 bytes
src/spec/assets/img/example14.png | Bin 67945 -> 0 bytes
src/spec/assets/img/example15.png | Bin 109440 -> 0 bytes
src/spec/assets/img/example16.png | Bin 114413 -> 0 bytes
src/spec/assets/img/example17.png | Bin 74161 -> 0 bytes
src/spec/assets/img/example18.png | Bin 82115 -> 0 bytes
src/spec/assets/img/example19.png | Bin 31915 -> 0 bytes
src/spec/assets/img/example2.png | Bin 50169 -> 0 bytes
src/spec/assets/img/example4.png | Bin 117382 -> 0 bytes
src/spec/assets/img/example5.png | Bin 140448 -> 0 bytes
src/spec/assets/img/example7.png | Bin 29789 -> 0 bytes
src/spec/assets/img/example8.png | Bin 146470 -> 0 bytes
src/spec/assets/img/example9.png | Bin 113690 -> 0 bytes
src/spec/assets/img/github1.png | Bin 87356 -> 0 bytes
src/spec/assets/img/github2.png | Bin 120646 -> 0 bytes
src/spec/assets/img/github3.png | Bin 47303 -> 0 bytes
src/spec/assets/img/github4.png | Bin 139616 -> 0 bytes
src/spec/assets/img/github5.png | Bin 56680 -> 0 bytes
src/spec/assets/img/github6.png | Bin 100961 -> 0 bytes
src/spec/assets/img/githubfork.png | Bin 73212 -> 0 bytes
src/spec/assets/img/githubhomepanel.png | Bin 125528 -> 0 bytes
src/spec/assets/img/githubsearch.png | Bin 56287 -> 0 bytes
src/spec/assets/img/groovy.png | Bin 57425 -> 0 bytes
src/spec/assets/img/groovy1.png | Bin 38285 -> 0 bytes
.../assets/img/jconsole-implicit-export.png | Bin
src/spec/{doc => }/assets/img/jconsole.gif | Bin
src/spec/{doc => }/assets/img/oc4jpie.gif | Bin
src/spec/assets/img/repolist.png | Bin 36749 -> 0 bytes
src/spec/assets/img/teamcity.png | Bin 4808 -> 0 bytes
src/spec/doc/assets/img/additionalmodules.png | Bin 21798 -> 0 bytes
src/spec/doc/assets/img/fileassociation.png | Bin 17110 -> 0 bytes
src/spec/doc/assets/img/native.jpg | Bin 25207 -> 0 bytes
src/spec/doc/assets/img/outdir.png | Bin 24047 -> 0 bytes
src/spec/doc/assets/img/setup.png | Bin 27700 -> 0 bytes
src/spec/doc/assets/img/variables.jpg | Bin 29572 -> 0 bytes
src/spec/doc/contributors.adoc | 4 +-
src/spec/doc/core-closures.adoc | 4 +-
src/spec/doc/core-differences-java.adoc | 6 +-
src/spec/doc/core-domain-specific-languages.adoc | 2 +-
src/spec/doc/core-getting-started.adoc | 21 +-
src/spec/doc/core-metaprogramming.adoc | 8 +-
src/spec/doc/core-object-orientation.adoc | 2 +-
src/spec/doc/core-operators.adoc | 6 +-
src/spec/doc/core-program-structure.adoc | 40 +-
src/spec/doc/core-semantics.adoc | 13 +-
src/spec/doc/core-syntax.adoc | 23 +-
src/spec/doc/core-traits.adoc | 4 +-
src/spec/doc/design-pattern-decorator.adoc | 2 +-
src/spec/doc/design-pattern-in-groovy.adoc | 2 +-
src/spec/doc/design-pattern-singleton.adoc | 2 +-
src/spec/doc/grape.adoc | 2 +-
src/spec/doc/groovy-contributions.adoc | 1187 --------------------
src/spec/doc/style-guide.adoc | 2 +-
src/spec/doc/tools-groovyc.adoc | 15 +-
src/spec/doc/tools-ide.adoc | 2 +-
src/spec/doc/type-checking-extensions.adoc | 6 +-
src/spec/test/ClosuresSpecTest.groovy | 2 +-
src/spec/test/PackageTest.groovy | 240 ++--
src/spec/test/PrimitiveTest.groovy | 25 +-
.../test/SaferScriptingASTTransformsTest.groovy | 2 +-
src/spec/test/gdk/WorkingWithIOSpecTest.groovy | 146 +--
.../test/metaprogramming/GroovyObjectTest.groovy | 4 +-
.../groovy/grape/defaultGrapeConfig.xml | 1 -
src/test/gls/enums/EnumTest.groovy | 21 +
src/test/gls/innerClass/InnerClassTest.groovy | 4 +-
src/test/gls/invocation/CovariantReturnTest.groovy | 2 +-
src/test/groovy/DateTest.groovy | 4 +-
src/test/groovy/GroovyClosureMethodsTest.groovy | 15 +-
src/test/groovy/OverrideTest.groovy | 32 +
src/test/groovy/ThreadMethodsTest.groovy | 19 +-
src/test/groovy/bugs/Groovy3175_Bug.groovy | 5 -
.../groovy/bugs/Groovy7709Bug.groovy} | 25 +-
.../groovy/execute/ExecuteTest_LinuxSolaris.groovy | 30 +
src/test/groovy/execute/ExecuteTest_Windows.groovy | 21 +
src/test/groovy/grape/GrapeIvyTest.groovy | 77 +-
src/test/groovy/lang/ClassReloadingTest.groovy | 24 +-
.../groovy/lang/InnerClassResolvingTest.groovy | 43 +-
src/test/groovy/lang/MapOfClosureTest.groovy | 6 +-
src/test/groovy/transform/stc/BugsSTCTest.groovy | 24 +
.../groovy/transform/stc/ClosuresSTCTest.groovy | 14 +
.../transform/stc/ConstructorsSTCTest.groovy | 17 +
.../stc/FieldsAndPropertiesSTCTest.groovy | 84 +-
.../groovy/transform/stc/GenericsSTCTest.groovy | 159 ++-
.../stc/PrecompiledExtensionNotExtendingDSL.groovy | 2 +-
.../stc/StaticTypeCheckingTestCase.groovy | 9 +-
.../transform/stc/TypeInferenceSTCTest.groovy | 18 +
src/test/groovy/util/BuilderSupportTest.groovy | 13 +
src/test/groovy/util/DelegatingScriptTest.groovy | 18 +
.../groovy/util/ProxyGeneratorAdapterTest.groovy | 7 +-
.../org/codehaus/groovy/ast/LineColumnCheck.txt | 29 +-
.../codehaus/groovy/ast/LineColumnCheckTest.groovy | 488 ++++++++
.../org/codehaus/groovy/ast/LineColumnChecker.java | 458 --------
.../groovy/classgen/GenericsGenTest.groovy | 8 -
.../codehaus/groovy/classgen/InterfaceTest.groovy | 7 -
.../ArraysAndCollectionsStaticCompileTest.groovy | 50 +-
.../classgen/asm/sc/BugsStaticCompileTest.groovy | 52 +-
.../asm/sc/DelegatesToStaticCompileTest.groovy | 33 +
.../sc/FieldsAndPropertiesStaticCompileTest.groovy | 178 +++
.../classgen/asm/sc/bugs/Groovy7363Bug.groovy | 28 +
.../classgen/asm/sc/bugs/Groovy7420Bug.groovy | 5 +-
.../classgen/asm/sc/bugs/Groovy7538Bug.groovy | 3 -
.../asm/sc/bugs/support/Groovy7363Support.java | 48 +
.../groovy/control/CompilerConfigurationTest.java | 10 +-
.../CompilerCustomizationBuilderTest.groovy | 11 +-
.../groovy/runtime/DefaultGroovyMethodsTest.groovy | 14 +
.../codehaus/groovy/runtime/NullObjectTest.groovy | 26 +-
.../groovy/runtime/PerInstanceMetaClassTest.groovy | 29 -
.../m12n/ExtensionModuleHelperForTests.groovy | 2 +-
.../EscapingOfStringAnnotationValuesTest.groovy | 27 +-
.../tools/stubgenerator/Groovy7747Bug.groovy | 63 ++
.../CanonicalComponentsTransformTest.groovy | 22 +
.../util/AbstractConcurrentMapSegmentTest.groovy | 9 +-
.../codehaus/groovy/util/ListHashMapTest.groovy | 64 ++
.../groovy/util/ManagedConcurrentMapTest.groovy} | 34 +-
.../util/ManagedConcurrentValueMapTest.groovy} | 31 +-
.../groovy/util/ManagedDoubleKeyMapTest.groovy} | 34 +-
.../groovy/util/ReferenceManagerTest.groovy | 167 +++
.../java/org/codehaus/groovy/ant/FileScanner.java | 2 +-
.../java/org/codehaus/groovy/ant/Groovydoc.java | 26 +-
subprojects/groovy-console/NOTICE | 2 +-
.../inspect/swingui/AstNodeToScriptAdapter.groovy | 2 +-
.../src/main/groovy/groovy/ui/Console.groovy | 46 +-
.../groovy/groovy/ui/SystemOutputInterceptor.java | 39 +-
.../groovy/groovy/ui/text/TextUndoManager.java | 2 +-
.../main/groovy/groovy/ui/view/GTKDefaults.groovy | 16 -
.../spec/{doc => }/assets/img/GroovyConsole.gif | Bin
.../src/spec/{doc => }/assets/img/astbrowser.png | Bin
.../{doc => }/assets/img/gconsole-sc-with-visu.png | Bin
.../assets/img/gconsole-sc-without-visu.png | Bin
.../spec/{doc => }/assets/img/gconsole-toolbar.png | Bin
.../groovy/swing/SwingBuilderConsoleTest.groovy | 54 +
.../codehaus/groovy/tools/groovydoc/Main.groovy | 10 +-
.../tools/groovydoc/SimpleGroovyClassDoc.java | 2 +-
.../groovy/tools/groovydoc/Main.properties | 4 +
.../gstringTemplates/classLevel/classDocName.html | 4 +-
.../gstringTemplates/topLevel/deprecated-list.html | 4 +-
.../gstringTemplates/topLevel/help-doc.html | 4 +-
.../gstringTemplates/topLevel/index-all.html | 4 +-
.../groovy-groovydoc/src/spec/doc/groovydoc.adoc | 6 +-
.../test/resources/groovydoc/groovyDocTests.xml | 4 +-
.../codehaus/groovy/tools/shell/Groovysh.groovy | 24 +-
.../org/codehaus/groovy/tools/shell/Parser.groovy | 22 +-
.../groovy/tools/shell/commands/DocCommand.groovy | 8 +-
.../shell/completion/ReflectionCompletor.groovy | 72 +-
.../groovy-groovysh/src/spec/doc/groovysh.adoc | 2 +-
.../groovy/tools/shell/GroovyshParsersTest.groovy | 11 +
.../groovy/tools/shell/GroovyshTest.groovy | 116 +-
.../tools/shell/commands/DocCommandTest.groovy | 8 +-
subprojects/groovy-jmx/src/spec/doc/jmx.adoc | 4 +-
.../src/main/java/groovy/json/JsonBuilder.java | 46 +-
.../src/main/java/groovy/json/JsonDelegate.java | 12 +-
.../src/main/java/groovy/json/JsonOutput.java | 18 +-
.../src/main/java/groovy/json/JsonParserType.java | 2 +-
.../src/main/java/groovy/json/JsonSlurper.java | 2 +-
.../java/groovy/json/StreamingJsonBuilder.java | 209 +++-
.../java/groovy/json/internal/CharScanner.java | 19 +-
.../java/groovy/json/internal/FastStringUtils.java | 36 +-
.../java/groovy/json/internal/JsonFastParser.java | 37 +-
.../java/groovy/json/internal/JsonParserLax.java | 39 +
.../src/main/java/groovy/json/internal/Sys.java | 25 +-
.../src/main/java/groovy/json/internal/Type.java | 2 +-
.../groovy-json/src/spec/doc/json-userguide.adoc | 6 +-
.../test/groovy/groovy/json/JsonBuilderTest.groovy | 62 +
.../test/groovy/groovy/json/JsonOutputTest.groovy | 16 +-
.../groovy/json/JsonSlurperCharSourceTest.groovy | 6 +
.../groovy/groovy/json/JsonSlurperLaxTest.groovy | 27 +
.../test/groovy/groovy/json/JsonSlurperTest.groovy | 37 +-
.../groovy/json/StreamingJsonBuilderTest.groovy | 77 +-
.../groovy/json/internal/CharScannerTest.groovy | 22 +
.../json/internal/FastStringUtilsTest.groovy | 9 +-
subprojects/groovy-jsr223/build.gradle | 15 -
.../src/main/java/groovy/sql/DataSet.java | 4 +-
.../main/java/groovy/sql/ExtractIndexAndSql.java | 2 +-
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 9 +-
.../groovy/groovy/swing/SwingBuilderTest.groovy | 79 ++
.../groovy/text/StreamingTemplateEngine.java | 2 +-
.../groovy/groovy/text/markup/BaseTemplate.java | 2 +-
.../src/spec/doc/markup-template-engine.adoc | 2 +-
.../spec/test/MarkupTemplateEngineSpecTest.groovy | 4 +-
.../NotYetImplementedASTTransformation.java | 40 +-
.../org/codehaus/groovy/testng/TestNgRunner.java | 6 +-
.../src/main/groovy/groovy/xml/StaxBuilder.groovy | 2 +-
.../util/slurpersupport/NamespaceAwareHashMap.java | 2 +-
.../groovy-xml/src/spec/doc/xml-userguide.adoc | 2 +-
.../src/spec/test/StaxBuilderTest.groovy | 1 +
335 files changed, 4246 insertions(+), 3058 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/groovy2.git
More information about the pkg-java-commits
mailing list