diff --git a/guava/module.json b/guava/module.json index e621749cfe0d..bbd32353b128 100644 --- a/guava/module.json +++ b/guava/module.json @@ -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}" } ] }, @@ -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}" } ] }, @@ -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}" } ] }, @@ -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}" } ] } diff --git a/integration-tests/gradle/build.gradle.kts b/integration-tests/gradle/build.gradle.kts index f0b294c74808..66f4970c20de 100644 --- a/integration-tests/gradle/build.gradle.kts +++ b/integration-tests/gradle/build.gradle.kts @@ -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) } + } } }