This is an automated email from the ASF dual-hosted git repository.
paulk 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 12a3e8a02d GROOVY-11556: Bump jarjar to 1.14.1 (build dependency)
12a3e8a02d is described below
commit 12a3e8a02dfca8e5722c0009d5c3585dc4fb7d8e
Author: Paul King <[email protected]>
AuthorDate: Mon Jan 20 12:47:54 2025 +1000
GROOVY-11556: Bump jarjar to 1.14.1 (build dependency)
---
build.gradle | 4 ++--
versions.properties | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/build.gradle b/build.gradle
index 0821eb2b14..d750ed63fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,8 +129,8 @@ dependencies {
testFixturesImplementation projects.groovyTest
testFixturesImplementation "xmlunit:xmlunit:${versions.xmlunit}"
- tools "com.eed3si9n.jarjar:jarjar:${versions.jarjar}"
- tools "org.apache.ant:ant:1.10.15" // updated jarjar dependency to remove
vulnerability
+ tools "com.eed3si9n.jarjar:ant-jarjar:${versions.jarjar}"
+ tools "org.apache.ant:ant:${versions.ant}" // use latest ant
tools "org.jboss.bridger:bridger:${versions.bridger}"
tools("net.sourceforge.cobertura:cobertura:${versions.cobertura}") {
exclude(group: 'asm')
diff --git a/versions.properties b/versions.properties
index 326440eb93..9ce26b7b05 100644
--- a/versions.properties
+++ b/versions.properties
@@ -32,8 +32,7 @@ ivy=2.5.3
jansi=2.4.1
jacksonDatabind=2.18.2
jackson=2.18.2
-# later jarjar versions sometimes leave empty META-INF/services files
-jarjar=1.8.0
+jarjar=1.14.1
javaParser=3.26.3
jline=2.14.6
jmh=1.37
