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 2022/02/24 23:05:12 UTC
[groovy] branch GROOVY_3_0_X updated (008ae028 -> 73e9532)
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 008ae028 GROOVY-10478: SC: indicate dynamic resolution of trait super fallback
new f1bce71 GROOVY-10490: Bump xstream to 1.4.19
new 407b2d9 GROOVY-10397: Bump junit5 to 5.8.2
new 73e9532 Merge branch 'GROOVY_3_0_X' of https://gitbox.apache.org/repos/asf/groovy into GROOVY_3_0_X
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
[groovy] 01/03: GROOVY-10490: Bump xstream to 1.4.19
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit f1bce714a6181aba893acdb24f67400557754613
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Feb 25 09:00:48 2022 +1000
GROOVY-10490: Bump xstream to 1.4.19
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 4b8e2d7..e2c6fb0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -149,7 +149,7 @@ ext {
qdoxVersion = '1.12.1'
slf4jVersion = '1.7.31'
xmlunitVersion = '1.6'
- xstreamVersion = '1.4.18'
+ xstreamVersion = '1.4.19'
spockVersion = '2.0-groovy-3.0'
spotbugsVersion = '4.4.0'
spotbugsAnnotationsVersion = '4.4.0'
[groovy] 02/03: GROOVY-10397: Bump junit5 to 5.8.2
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 407b2d92cea465197fd3a4ebf312ee623566ec3e
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Feb 25 09:01:50 2022 +1000
GROOVY-10397: Bump junit5 to 5.8.2
---
build.gradle | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/build.gradle b/build.gradle
index e2c6fb0..753bdbe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,8 +154,8 @@ ext {
spotbugsVersion = '4.4.0'
spotbugsAnnotationsVersion = '4.4.0'
checkstyleVersion = '8.44'
- junit5Version = '5.8.1'
- junit5PlatformVersion = '1.8.1'
+ junit5Version = '5.8.2'
+ junit5PlatformVersion = '1.8.2'
jcipAnnotationsVersion = '1.0'
jspApiVersion = '2.3.3'
servletApiVersion = '4.0.1'
[groovy] 03/03: Merge branch 'GROOVY_3_0_X' of https://gitbox.apache.org/repos/asf/groovy into GROOVY_3_0_X
Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
paulk pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 73e953222f91cf5f6ec9961624af2d924978659a
Merge: 407b2d9 008ae028
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Feb 25 09:05:05 2022 +1000
Merge branch 'GROOVY_3_0_X' of https://gitbox.apache.org/repos/asf/groovy into GROOVY_3_0_X
# Conflicts:
# build.gradle
build.gradle | 31 ++-
.../org/codehaus/groovy/gradle/JarJarTask.groovy | 2 +-
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
src/main/java/groovy/ui/GroovyMain.java | 2 +-
.../apache/groovy/ast/tools/ClassNodeUtils.java | 28 +-
.../codehaus/groovy/ast/tools/GenericsUtils.java | 25 +-
.../groovy/classgen/AsmClassGenerator.java | 6 +
.../groovy/classgen/InnerClassVisitor.java | 5 +-
.../codehaus/groovy/classgen/asm/OperandStack.java | 2 +-
.../classgen/asm/sc/StaticInvocationWriter.java | 3 +-
.../asm/sc/StaticTypesStatementWriter.java | 2 +-
.../transform/AutoImplementASTTransformation.java | 16 +-
.../transform/CategoryASTTransformation.java | 292 +++++++++-----------
.../transform/DelegateASTTransformation.java | 248 ++++++++++-------
.../transform/NamedVariantASTTransformation.java | 144 ++++++----
.../transformers/BooleanExpressionTransformer.java | 10 +-
.../groovy/transform/trait/TraitComposer.java | 98 +++----
src/spec/doc/core-domain-specific-languages.adoc | 31 ++-
src/spec/test/metaprogramming/CategoryTest.groovy | 20 ++
src/test/gls/innerClass/InnerClassTest.groovy | 15 +
src/test/groovy/bugs/Groovy10478.groovy | 32 +++
src/test/groovy/bugs/Groovy6932Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy8060Bug.groovy | 2 +-
src/test/groovy/bugs/Groovy9259.groovy | 109 ++++++++
src/test/groovy/lang/CategoryAnnotationTest.groovy | 307 ++++++++++++---------
src/test/groovy/transform/NamedVariantTest.groovy | 86 ------
src/test/groovy/transform/stc/BugsSTCTest.groovy | 36 +++
src/test/groovy/transform/stc/LoopsSTCTest.groovy | 30 +-
src/test/groovy/ui/GroovyMainTest.groovy | 20 +-
.../classgen/asm/sc/LoopsStaticCompileTest.groovy | 10 +-
.../transform/AutoImplementTransformTest.groovy | 92 ++++++
.../groovy/transform/DelegateTransformTest.groovy | 220 +++++++++++----
.../transform/NamedVariantTransformTest.groovy | 170 ++++++++++--
subprojects/groovy-sql/build.gradle | 2 +-
.../groovy-sql/src/spec/test/SqlTest.groovy | 4 +-
subprojects/groovy-testng/build.gradle | 3 +-
.../apache/groovy/parser/antlr4/AstBuilder.java | 61 ++--
38 files changed, 1383 insertions(+), 787 deletions(-)