[groovy] branch GROOVY_4_0_X updated: GROOVY-10730: Fix merging glitch

[su...@apache.org]

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

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


The following commit(s) were added to refs/heads/GROOVY_4_0_X by this push:
     new 07cd4c42d7 GROOVY-10730: Fix merging glitch
07cd4c42d7 is described below

commit 07cd4c42d77c0b7255878198bb12eed7ec584a47
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Aug 28 23:34:59 2022 +0800

    GROOVY-10730: Fix merging glitch
---
 gradle.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 1e0082e429..297d23d5fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-groovyVersion=5.0.0-SNAPSHOT
+groovyVersion=4.0.5-SNAPSHOT
 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
-groovyBundleVersion=5.0.0.SNAPSHOT
+groovyBundleVersion=4.0.5.SNAPSHOT
 
 groovyTargetBytecodeVersion=1.8
 targetJavaVersion=8
 
-binaryCompatibilityBaseline=4.0.0
+binaryCompatibilityBaseline=3.0.9
 gradle_version=7.5.1
 
 groovyJUnit_ms=512m