Skip to content

Add Gradle capability declarations to detect duplicate Guava artifacts #7990

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+126 −0
Open

Add Gradle capability declarations to detect duplicate Guava artifacts #7990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d061dfa
Add Guava dependencies to module.json
lmcrean Sep 14, 2025
0a03cc7
Remove Apache ServiceMix Guava bundle dependencies from module.json
lmcrean Sep 21, 2025
ae39076
Add capability resolution for additional Guava modules in build.gradl…
lmcrean Oct 11, 2025
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
80 changes: 80 additions & 0 deletions guava/module.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,26 @@
"group": "com.google.collections",
"name": "google-collections",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-base",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-jdk5",
"version": "${pom.version}"
},
{
"group": "org.sonatype.sisu",
"name": "sisu-guava",
"version": "${pom.version}"
},
{
"group": "org.hudsonci.lib.guava",
"name": "guava",
"version": "${pom.version}"
}
]
},
Expand Down Expand Up @@ -144,6 +164,26 @@
"group": "com.google.collections",
"name": "google-collections",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-base",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-jdk5",
"version": "${pom.version}"
},
{
"group": "org.sonatype.sisu",
"name": "sisu-guava",
"version": "${pom.version}"
},
{
"group": "org.hudsonci.lib.guava",
"name": "guava",
"version": "${pom.version}"
}
]
},
Expand Down Expand Up @@ -210,6 +250,26 @@
"group": "com.google.collections",
"name": "google-collections",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-base",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-jdk5",
"version": "${pom.version}"
},
{
"group": "org.sonatype.sisu",
"name": "sisu-guava",
"version": "${pom.version}"
},
{
"group": "org.hudsonci.lib.guava",
"name": "guava",
"version": "${pom.version}"
}
]
},
Expand Down Expand Up @@ -276,6 +336,26 @@
"group": "com.google.collections",
"name": "google-collections",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-base",
"version": "${pom.version}"
},
{
"group": "com.google.guava",
"name": "guava-jdk5",
"version": "${pom.version}"
},
{
"group": "org.sonatype.sisu",
"name": "sisu-guava",
"version": "${pom.version}"
},
{
"group": "org.hudsonci.lib.guava",
"name": "guava",
"version": "${pom.version}"
}
]
}
Expand Down
46 changes: 46 additions & 0 deletions integration-tests/gradle/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,52 @@ subprojects {
}
?.apply { select(this) }
}
withCapability("com.google.guava:listenablefuture") {
candidates
.find {
val idField =
it.javaClass.getDeclaredMethod("getId")
(idField.invoke(it) as ModuleComponentIdentifier).module == "guava"
}
?.apply { select(this) }
}
// Resolution strategies for the 4 new capability declarations from PR 7990
withCapability("com.google.guava:guava-base") {
candidates
.find {
val idField =
it.javaClass.getDeclaredMethod("getId")
(idField.invoke(it) as ModuleComponentIdentifier).module == "guava"
}
?.apply { select(this) }
}
withCapability("com.google.guava:guava-jdk5") {
candidates
.find {
val idField =
it.javaClass.getDeclaredMethod("getId")
(idField.invoke(it) as ModuleComponentIdentifier).module == "guava"
}
?.apply { select(this) }
}
withCapability("org.sonatype.sisu:sisu-guava") {
candidates
.find {
val idField =
it.javaClass.getDeclaredMethod("getId")
(idField.invoke(it) as ModuleComponentIdentifier).module == "guava"
}
?.apply { select(this) }
}
withCapability("org.hudsonci.lib.guava:guava") {
candidates
.find {
val idField =
it.javaClass.getDeclaredMethod("getId")
(idField.invoke(it) as ModuleComponentIdentifier).module == "guava"
}
?.apply { select(this) }
}
}
}

Expand Down