GROOVY-9990: Bump openbeans to 1.0.1

apache · Mar 19, 2021 · 8c2c27c · 8c2c27c
1 parent 6eeaed7
commit 8c2c27c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -111,7 +111,7 @@ dependencies {
     implementation "org.ow2.asm:asm-commons:${versions.asm}"
     implementation "org.ow2.asm:asm-tree:${versions.asm}"
     implementation "org.ow2.asm:asm-util:${versions.asm}"
-    implementation "com.googlecode:openbeans:${versions.openbeans}"
+    implementation "me.champeau.openbeans:openbeans:${versions.openbeans}"
     implementation "com.tunnelvisionlabs:antlr4-runtime:${versions.antlr4}"
 
     antlr "com.tunnelvisionlabs:antlr4:${versions.antlr4}"
@@ -252,7 +252,6 @@ if (file('user.gradle').exists()) {
 
 licenseReport {
     excludeGroups = [
-            'com.googlecode', // openbeans has no pom but is ASLv2
             'org.multiverse'  // we never include this optional dependency of an optional dependency
     ]
 }

diff --git a/buildSrc/src/main/groovy/org.apache.groovy-common.gradle b/buildSrc/src/main/groovy/org.apache.groovy-common.gradle
@@ -47,19 +47,6 @@ repositories {
         maven { url 'https://maven.aliyun.com/nexus/content/groups/public' }
     }
     mavenCentral()
-    exclusiveContent {
-        forRepository {
-            maven { // openbeans
-                url 'https://dl.bintray.com/melix/thirdparty-apache'
-                metadataSources {
-                    artifact()
-                }
-            }
-        }
-        filter {
-            includeModule('com.googlecode', 'openbeans')
-        }
-    }
 }
 
 tasks.named('rat') {

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -615,6 +615,11 @@
             <sha512 value="84c4330b4677c21a5cea0337b9e9946b70bb6f5a7c52b87db165c30905a026b7c6b833249a43364b211049cfb21f033c64106fc6335618e4c75f8f77309f8dc3" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="me.champeau.openbeans" name="openbeans" version="1.0.1">
+         <artifact name="openbeans-1.0.1.jar">
+            <pgp value="0191e61acbbe76323ac15c83b5ad94bdd6bdb924"/>
+         </artifact>
+      </component>
       <component group="net.bytebuddy" name="byte-buddy" version="1.10.16">
          <artifact name="byte-buddy-1.10.16.jar">
             <pgp value="a7892505cf1a58076453e52d7999befba1039e8b"/>

diff --git a/versions.properties b/versions.properties
@@ -39,7 +39,7 @@ logback = 1.2.3
 junit = 4.13.2
 log4j = 1.2.17
 log4j2 = 2.14.0
-openbeans = 1.0
+openbeans = 1.0.1
 picocli = 4.5.2
 qdox = 1.12.1
 slf4j = 1.7.30