Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre #945

Merged
merged 2 commits into from
Jul 1, 2023
Merged

Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre #945

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e66c3a
Bump com.google.guava:guava from 32.0.1-jre to 32.1.1-jre
dependabot[bot] Jun 30, 2023
8493a1b
Remove unnecessary transitive guava dependencies
chadlwilson Jul 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 37 additions & 19 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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) {
Expand All @@ -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")
Expand Down