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 2020/07/06 10:58:40 UTC
[groovy] branch GROOVY_3_0_X updated (cb21291 -> 9d6a109)
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 cb21291 add missing notice info
new 1426e77 GROOVY-9623: Bump Jackson version to 2.11.1
new ee2474d remove codenarc warning
new 6a14ba6 GROOVY-9624: Bump Codenarc to 1.6
new d4437e1 GROOVY-9625: Bump spotbugs/plugin to 4.0.6/4.4.4
new c778920 GROOVY-9626: Bump rat to 0.7.0
new 6984810 fix asciidoc warnings
new 7ed0147 fix javadoc warnings
new 9d6a109 GROOVY-9627: Bump picocli to 4.4.0
The 8 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:
build.gradle | 11 ++++++-----
gradle/quality.gradle | 2 +-
.../java/org/codehaus/groovy/control/CompilationUnit.java | 4 ++--
.../groovy/vmplugin/v8/PluginDefaultGroovyMethods.java | 2 +-
subprojects/groovy-ant/src/spec/doc/ant-builder.adoc | 4 ++--
subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc | 6 ++++--
.../src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy | 6 +++---
.../groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy | 2 +-
subprojects/groovy-yaml/build.gradle | 2 +-
9 files changed, 21 insertions(+), 18 deletions(-)
[groovy] 01/08: GROOVY-9623: Bump Jackson version to 2.11.1
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 1426e7708e26d0219d6952a748c456befed11526
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 19:45:04 2020 +1000
GROOVY-9623: Bump Jackson version to 2.11.1
---
subprojects/groovy-yaml/build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-yaml/build.gradle b/subprojects/groovy-yaml/build.gradle
index 25a6b75..8c857fc 100644
--- a/subprojects/groovy-yaml/build.gradle
+++ b/subprojects/groovy-yaml/build.gradle
@@ -18,7 +18,7 @@
*/
ext {
- jacksonVersion = '2.11.0'
+ jacksonVersion = '2.11.1'
}
dependencies {
[groovy] 05/08: GROOVY-9626: Bump rat to 0.7.0
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 c778920086f0a1561f730b2b966737e16e78c1a1
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 19:59:23 2020 +1000
GROOVY-9626: Bump rat to 0.7.0
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 417857f..c35ea26 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,7 +39,7 @@ buildscript {
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.8'
classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.3"
//classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
- classpath "org.nosphere.apache:creadur-rat-gradle:0.6.0"
+ classpath "org.nosphere.apache:creadur-rat-gradle:0.7.0"
classpath "gradle.plugin.com.github.jk1:gradle-license-report:1.3"
}
}
[groovy] 07/08: fix javadoc warnings
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 7ed01478cdcbf4228b7e067c440fbf8e3f8e784a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 20:27:37 2020 +1000
fix javadoc warnings
---
src/main/java/org/codehaus/groovy/control/CompilationUnit.java | 4 ++--
.../org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
index 7f587b7..a2233bd 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilationUnit.java
@@ -115,12 +115,12 @@ public class CompilationUnit extends ProcessingUnit {
}
}
- /** Controls behavior of {@link #classgen()} and other routines. */
+ /** Controls behavior of {@link #classgen} and other routines. */
protected boolean debug;
/** True after the first {@link #configure(CompilerConfiguration)} operation. */
protected boolean configured;
- /** A callback for use during {@link #classgen()} */
+ /** A callback for use during {@link #classgen} */
protected ClassgenCallback classgenCallback;
/** A callback for use during {@link #compile()} */
protected ProgressCallback progressCallback;
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
index 65f2181..701cd72 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
@@ -529,7 +529,7 @@ public class PluginDefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* }
*
* // Stream#toArray(IntFunction) should still be used for closure literal:
- * assert Arrays.equals(['x'].stream().toArray { n -> new String[n] }, ['x'] as String[])
+ * assert Arrays.equals(['x'].stream().toArray { n -> new String[n] }, ['x'] as String[])
*
* // Stream#toArray(IntFunction) should still be used for method reference:
* assert Arrays.equals(['x'].stream().toArray(String[]::new), ['x'] as String[])
[groovy] 02/08: remove codenarc warning
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 ee2474dfaaa1230a2c9f4fa7d5f7eec8b86650e2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 19:48:56 2020 +1000
remove codenarc warning
---
.../src/main/groovy/groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-test-junit5/src/main/groovy/groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy b/subprojects/groovy-test-junit5/src/main/groovy/groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy
index 0b74f55..adc3f01 100644
--- a/subprojects/groovy-test-junit5/src/main/groovy/groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy
+++ b/subprojects/groovy-test-junit5/src/main/groovy/groovy/junit5/plugin/GroovyJUnitRunnerHelper.groovy
@@ -43,6 +43,6 @@ class GroovyJUnitRunnerHelper {
listener.summary.printFailuresTo(new PrintWriter(System.out, true))
return listener.summary.failures[0].exception
}
- return null
+ null
}
}
[groovy] 06/08: fix asciidoc warnings
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 698481038def8e15798c33c415138bbeb16eeb1a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 20:27:09 2020 +1000
fix asciidoc warnings
---
subprojects/groovy-ant/src/spec/doc/ant-builder.adoc | 4 ++--
subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc b/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
index 480c94c..0d797f1 100644
--- a/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
+++ b/subprojects/groovy-ant/src/spec/doc/ant-builder.adoc
@@ -19,13 +19,13 @@
//////////////////////////////////////////
-[[title-heading]]
+[[antbuilder]]
= AntBuilder
[NOTE]
Here we describe `AntBuilder` which lets you write Ant build scripts
in Groovy rather than XML. You may also be interested in using Groovy
-from Ant using the <<groovy-ant-task.adoc#title-heading,Groovy Ant task>>.
+from Ant using the <<groovy-ant-task.adoc#ThegroovyAntTask-groovyc,Groovy Ant task>>.
Despite being primarily a build tool, http://ant.apache.org/[Apache Ant] is
a very practical tool for manipulating files including zip files, copy, resource processing, and more.
diff --git a/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc b/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
index cea3333..cb44801 100644
--- a/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
+++ b/subprojects/groovy-ant/src/spec/doc/groovy-ant-task.adoc
@@ -19,16 +19,18 @@
//////////////////////////////////////////
-[[title-heading]]
= The <groovy> Ant Task
+[[ThegroovyAntTask-groovyc]]
+== `<groovy>`
+
[NOTE]
Here we describe an Ant task for using Groovy
from within an Ant build file.
You may also be interested in
Ant's built-in https://ant.apache.org/manual/Tasks/script.html[`script`] task
which supports Groovy and other languages, or
-<<ant-builder.adoc#title-heading,`AntBuilder`>> which lets you write Ant build scripts
+<<ant-builder.adoc#antbuilder,`AntBuilder`>> which lets you write Ant build scripts
in Groovy rather than XML.
Executes a series of Groovy statements from http://ant.apache.org/[Apache Ant].
[groovy] 08/08: GROOVY-9627: Bump picocli to 4.4.0
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 9d6a1099e02f9a38f91f4c8b4f10bdcc3b900557
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 20:58:27 2020 +1000
GROOVY-9627: Bump picocli to 4.4.0
---
build.gradle | 2 +-
.../src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index c35ea26..3e6cd05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,7 +146,7 @@ ext {
log4jVersion = '1.2.17'
log4j2Version = '2.13.3'
openbeansVersion = '1.0'
- picocliVersion = '4.3.2'
+ picocliVersion = '4.4.0'
qdoxVersion = '1.12.1'
slf4jVersion = '1.7.25'
xmlunitVersion = '1.6'
diff --git a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
index 7cf9277..7e83064 100644
--- a/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-picocli/src/test/groovy/groovy/cli/picocli/CliBuilderTest.groovy
@@ -524,7 +524,7 @@ class CliBuilderTest extends GroovyTestCase {
cli.writer = printWriter
options = cli.parse(['-abacus', 'foo'])
assert options == null
- assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unmatched argument'))
+ assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unknown option'))
assertTrue(stringWriter.toString(), stringWriter.toString().contains('-us'))
}
@@ -934,7 +934,7 @@ class CliBuilderTest extends GroovyTestCase {
resetPrintWriter()
cli.writer = printWriter
assert cli.parse(['-indy']) == null
- assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unmatched argument'))
+ assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unknown option'))
assertTrue(stringWriter.toString(), stringWriter.toString().contains('-ndy'))
assert cli.parse(['--help']).help
@@ -942,7 +942,7 @@ class CliBuilderTest extends GroovyTestCase {
resetPrintWriter()
cli.writer = printWriter
assert cli.parse(['-help']) == null
- assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unmatched argument'))
+ assertTrue(stringWriter.toString(), stringWriter.toString().startsWith('error: Unknown option'))
assertTrue(stringWriter.toString(), stringWriter.toString().contains('-elp'))
assert cli.parse(['--version']).version
[groovy] 03/08: GROOVY-9624: Bump Codenarc to 1.6
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 6a14ba6770638f00f5ba4be329c6cd196b926251
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 19:50:01 2020 +1000
GROOVY-9624: Bump Codenarc to 1.6
---
gradle/quality.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index eebe168..e73060c 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -42,7 +42,7 @@ allprojects { proj ->
dependencies {
checkstyle "com.puppycrawl.tools:checkstyle:$checkstyleVersion"
- codenarc "org.codenarc:CodeNarc:1.5"
+ codenarc "org.codenarc:CodeNarc:1.6"
spotbugs "com.github.spotbugs:spotbugs:$spotbugsVersion"
if (proj.name.contains('jaxb') && JavaVersion.current().isJava9Compatible()) {
spotbugs 'javax.xml.bind:jaxb-api:2.3.0'
[groovy] 04/08: GROOVY-9625: Bump spotbugs/plugin to 4.0.6/4.4.4
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 d4437e1bfbe508383e648daa6bcc58d48f7dcd5a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Mon Jul 6 19:56:38 2020 +1000
GROOVY-9625: Bump spotbugs/plugin to 4.0.6/4.4.4
---
build.gradle | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/build.gradle b/build.gradle
index 92f4e04..417857f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,7 +46,7 @@ buildscript {
plugins {
id 'me.champeau.buildscan-recipes' version '0.2.3'
- id 'com.github.spotbugs' version '4.2.0'
+ id 'com.github.spotbugs' version '4.4.4'
id 'com.github.ben-manes.versions' version '0.28.0'
id 'com.github.blindpirate.osgi' version '0.0.3'
id 'org.sonarqube' version '2.8'
@@ -152,8 +152,8 @@ ext {
xmlunitVersion = '1.6'
xstreamVersion = '1.4.12'
spockVersion = '2.0-M3-groovy-3.0'
- spotbugsVersion = '4.0.3'
- spotbugsAnnotationsVersion = '4.0.3'
+ spotbugsVersion = '4.0.6'
+ spotbugsAnnotationsVersion = '4.0.6'
checkstyleVersion = '8.34'
junit5Version = '5.6.2'
junit5PlatformVersion = '1.6.2'
@@ -212,6 +212,7 @@ dependencies {
testImplementation project(':groovy-dateutil')
testImplementation project(':groovy-test')
testImplementation project(':groovy-macro')
+ spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.10.1'
}
ext.generatedDirectory = "${buildDir}/generated/sources"