Merge pull request #945 from gocd/dependabot/gradle/com.google.guava-…

…guava-32.1.1-jre Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre
gocd · Jul 1, 2023 · 2272a0b · 2272a0b
2 parents ae862cb + 8493a1b
commit 2272a0b
Showing 1 changed file with 37 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -18,24 +18,28 @@ apply plugin: 'java'
 apply from: "https://raw.githubusercontent.com/gocd/gocd-plugin-gradle-task-helpers/master/helper.gradle?_=${(int) (new Date().toInstant().epochSecond / 60)}"
 
 gocdPlugin {
-  id = 'cd.go.artifact.docker.registry'
-  pluginVersion = '1.3.1'
-  goCdVersion = '20.9.0'
-  name = 'Artifact plugin for docker'
-  description = 'Plugin allows to push/pull docker image from public or private docker registry'
-  vendorName = 'Thoughtworks, Inc.'
-  vendorUrl = 'https://github.com/gocd/docker-registry-artifact-plugin'
-
-  githubRepo {
-    owner = System.getenv('GITHUB_USER') ?: 'bob'
-    repo = 'docker-registry-artifact-plugin'
-    token = System.getenv('GITHUB_TOKEN') ?: 'bad-token'
-  }
-
-  pluginProject = project
-
-  prerelease = !"No".equalsIgnoreCase(System.getenv('PRERELEASE'))
-  assetsToRelease = [project.tasks.findByName('jar')]
+    id = 'cd.go.artifact.docker.registry'
+    pluginVersion = '1.3.1'
+    goCdVersion = '20.9.0'
+    name = 'Artifact plugin for docker'
+    description = 'Plugin allows to push/pull docker image from public or private docker registry'
+    vendorName = 'Thoughtworks, Inc.'
+    vendorUrl = 'https://github.com/gocd/docker-registry-artifact-plugin'
+
+    githubRepo {
+        owner = System.getenv('GITHUB_USER') ?: 'bob'
+        repo = 'docker-registry-artifact-plugin'
+        token = System.getenv('GITHUB_TOKEN') ?: 'bad-token'
+    }
+
+    pluginProject = project
+
+    prerelease = !"No".equalsIgnoreCase(System.getenv('PRERELEASE'))
+    assetsToRelease = [project.tasks.findByName('jar')]
+
+    licenseReport {
+        excludes = ['com.google.guava:guava-parent']
+    }
 }
 
 version = gocdPlugin.fullVersion(project)
@@ -70,7 +74,7 @@ dependencies {
     implementation platform('com.fasterxml.jackson:jackson-bom:2.15.2')
     implementation platform('org.glassfish.jersey:jersey-bom:2.25')
     constraints {
-        implementation('com.google.guava:guava:32.0.1-jre') {
+        implementation('com.google.guava:guava:32.1.1-jre') {
             because "Spotify docker-client uses an older version"
         }
         implementation(project.deps.slf4j) {
@@ -84,6 +88,20 @@ dependencies {
         }
     }
 
+    components {
+        // workaround for Guava metadata declaring dependencies that are not needed at runtime
+        // see https://github.com/google/guava/pull/6606
+        withModule('com.google.guava:guava', { details ->
+            details.allVariants {
+                withDependencies {
+                    removeAll {
+                        it.group in ["com.google.code.findbugs", "org.checkerframework", "com.google.errorprone"]
+                    }
+                }
+            }
+        })
+    }
+
     modules {
         module('commons-logging:commons-logging') {
             replacedBy('org.slf4j:jcl-over-slf4j', "Everything should go via SLF4J")