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 2024/04/18 20:43:42 UTC

(groovy) branch master updated (d10f8d8984 -> 19832006c3)

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


    from d10f8d8984 update dependency metadata
     new aca2957d11 GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test)
     new 19832006c3 swap to develocity plugin cont'd

The 2 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:
 gradle/build-scans.gradle                                      |  8 +++-----
 .../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy   | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)


(groovy) 01/02: GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test)

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit aca2957d11d50aee46131acfcc34d863fb394249
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Apr 19 06:43:04 2024 +1000

    GROOVY-11361: Bump Commons CLI to 1.7.0 (fix test)
---
 .../src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
index d23b64a177..7a439d889d 100644
--- a/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
+++ b/subprojects/groovy-cli-commons/src/test/groovy/groovy/cli/commons/CliBuilderTest.groovy
@@ -59,11 +59,11 @@ class CliBuilderTest extends GroovyTestCase {
         cli.c(argName: 'charset', args: 1, longOpt: 'encoding', 'character encoding')
         cli.i(argName: 'extension', optionalArg: true, 'modify files in place, create backup if extension is given (e.g. \'.bak\')')
         def stringified = cli.options.toString()
-        assert stringified =~ /i=\[ option: i  :: modify files in place, create backup if extension is given/
-        assert stringified =~ /c=\[ option: c encoding  \[ARG] :: character encoding/
-        assert stringified =~ /h=\[ option: h help  :: usage information/
-        assert stringified =~ /encoding=\[ option: c encoding  \[ARG] :: character encoding/
-        assert stringified =~ /help=\[ option: h help  :: usage information/
+        assert stringified =~ /i=\[ [Oo]ption:? i ? :: modify files in place, create backup if extension is given/
+        assert stringified =~ /c=\[ [Oo]ption:? c encoding ? \[ARG] :: character encoding/
+        assert stringified =~ /h=\[ [Oo]ption:? h help ? :: usage information/
+        assert stringified =~ /encoding=\[ [Oo]ption:? c encoding ? \[ARG] :: character encoding/
+        assert stringified =~ /help=\[ [Oo]ption:? h help ? :: usage information/
         def options = cli.parse(optionList)
         assert options.hasOption('h')
         assert options.hasOption('help')


(groovy) 02/02: swap to develocity plugin cont'd

Posted by pa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit 19832006c31ec6d42a11a8d281c37ec6b5f6e57a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Fri Apr 19 06:43:27 2024 +1000

    swap to develocity plugin cont'd
---
 gradle/build-scans.gradle | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gradle/build-scans.gradle b/gradle/build-scans.gradle
index 2b749d096c..b589c176be 100644
--- a/gradle/build-scans.gradle
+++ b/gradle/build-scans.gradle
@@ -20,15 +20,13 @@
 def env = System.getenv()
 boolean isCI = env.CI || env.TRAVIS || env.TEAMCITY_VERSION || env.GITHUB_ACTIONS
 
-gradleEnterprise {
+develocity {
     server = "https://ge.apache.org"
     allowUntrustedServer = false
 
     buildScan {
-        capture { taskInputFiles = true }
         uploadInBackground = !isCI
-        publishAlways()
-        publishIfAuthenticated()
+        publishing.onlyIf { println "it.authenticated=" + it.authenticated; it.authenticated }
         obfuscation {
             ipAddresses { addresses -> addresses.collect { address -> "0.0.0.0" } }
         }
@@ -40,7 +38,7 @@ buildCache {
         enabled = !isCI
     }
 
-    remote(gradleEnterprise.buildCache) {
+    remote(develocity.buildCache) {
         enabled = false
     }
 }