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 2021/12/29 11:41:34 UTC

[groovy-release] branch master updated: changes from 4.0.0-rc-2

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-release.git


The following commit(s) were added to refs/heads/master by this push:
     new 1523aed  changes from 4.0.0-rc-2
1523aed is described below

commit 1523aed0b3824de5694c67b9aeeff7bbe50bc5f2
Author: Paul King <pa...@asert.com.au>
AuthorDate: Wed Dec 29 21:41:27 2021 +1000

    changes from 4.0.0-rc-2
---
 gradle/phase1.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/phase1.gradle b/gradle/phase1.gradle
index d7dc5e1..b9bc6d5 100644
--- a/gradle/phase1.gradle
+++ b/gradle/phase1.gradle
@@ -46,7 +46,7 @@ task confirmVersion(dependsOn: [assumesPropsSet, checkout]) {
     description = "Confirm version to release (assumes -PreleaseVersion=version_to_release)"
     doLast {
         def propsFile = file("$stagingDir/gradle.properties")
-        def versionLines = propsFile.text.readLines().findAll { it.matches(/groovy.*Version.*/) }
+        def versionLines = propsFile.text.readLines().findAll { it.matches(/groovyVersion.*|groovyBundleVersion.*/) }
         def normalVersion = /(?ism).*$numVersion[a-zA-Z\-]*\.SNAPSHOT.*/
         def bundleVersion = /(?ism).*$numVersion[a-zA-Z\-]*-SNAPSHOT.*/
         versionLines.each {