You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2021/12/05 10:36:28 UTC

[groovy] branch master updated: GROOVY-10402: Bump jarjar to 1.8.0

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 332a196  GROOVY-10402: Bump jarjar to 1.8.0
332a196 is described below

commit 332a19600018305ab9c5742bcaa874fd63c53c85
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sun Dec 5 18:36:09 2021 +0800

    GROOVY-10402: Bump jarjar to 1.8.0
---
 build.gradle                                                   |  2 +-
 .../src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy |  2 +-
 gradle/verification-metadata.xml                               | 10 ++++++++++
 versions.properties                                            |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index b42e659..575c54e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -140,7 +140,7 @@ dependencies {
     testImplementation "org.slf4j:jcl-over-slf4j:${versions.slf4j}"
     testImplementation "com.thoughtworks.qdox:qdox:${versions.qdox}"
 
-    tools "org.pantsbuild:jarjar:${versions.jarjar}"
+    tools "com.eed3si9n.jarjar:jarjar:${versions.jarjar}"
     tools "org.jboss.bridger:bridger:${versions.bridger}"
 
     tools("net.sourceforge.cobertura:cobertura:${versions.cobertura}") {
diff --git a/buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy b/buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
index ddbf55c..369fdf2 100644
--- a/buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
+++ b/buildSrc/src/main/groovy/org/apache/groovy/gradle/JarJarTask.groovy
@@ -38,7 +38,7 @@ import javax.inject.Inject
 
 @CacheableTask
 class JarJarTask extends DefaultTask {
-    private final static String JARJAR_CLASS_NAME = 'org.pantsbuild.jarjar.JarJarTask'
+    private final static String JARJAR_CLASS_NAME = 'com.eed3si9n.jarjar.JarJarTask'
 
     @Internal
     String description = "Repackages dependencies into a shaded jar"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 54e9442..5652187 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -295,6 +295,11 @@
             <sha512 value="5ee2ef4c12888a48d7c830189d06ee8a653c7664a53c9b6fa935d4e7866b0454111f8092d7ece086ec80c61edab2856187a1e247873e5c8e4724efb02c37504b" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="com.eed3si9n.jarjar" name="jarjar" version="1.8.0">
+         <artifact name="jarjar-1.8.0.jar">
+            <pgp value="ea313384ca0eba950ea017e937890e298d9a2bfa"/>
+         </artifact>
+      </component>
       <component group="com.github.ben-manes" name="gradle-versions-plugin" version="0.33.0">
          <artifact name="gradle-versions-plugin-0.33.0.jar">
             <sha512 value="c0b463a7c016ba23733da36f7b6aa224cd466605e8eba63688a06665e9af6110218d4081088f8af824beb6e139259cac18e7e26dd9b63826698d0669ff29b303" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -713,6 +718,11 @@
             <pgp value="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0"/>
          </artifact>
       </component>
+      <component group="org.apache.commons" name="commons-lang3" version="3.8.1">
+         <artifact name="commons-lang3-3.8.1.jar">
+            <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
+         </artifact>
+      </component>
       <component group="org.apache.commons" name="commons-math3" version="3.2">
          <artifact name="commons-math3-3.2.jar">
             <pgp value="12d16069219c90212a974d119ae296fd02e9f65b"/>
diff --git a/versions.properties b/versions.properties
index b9eb4d6..87ef4b5 100644
--- a/versions.properties
+++ b/versions.properties
@@ -29,7 +29,7 @@ gpars=1.2.1
 ivy=2.5.0
 jansi=2.4.0
 jackson=2.13.0
-jarjar=1.7.2
+jarjar=1.8.0
 javaParser=3.23.1
 jline=2.14.6
 jmh=1.27