From 72be38cf2cc3fce21de685e815b63cf38480514c Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Mon, 23 Sep 2019 17:13:49 +0200 Subject: [PATCH] Fix API Diff Gradle task Prior to this change, the Gradle API Diff task was failing due to a missing class (a Guava class) during processing. This might be a dependency that was previously brought by some other dependency. This commit adds that dependency as a workaround, and improves the Gradle API Diff task to only select relevant projects when running the task (projects using the Java Plugin and the Maven Publish Plugin). --- buildSrc/build.gradle | 2 +- .../java/org/springframework/build/api/ApiDiffPlugin.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 09a31a0123..1aed5f6e78 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -9,7 +9,7 @@ repositories { dependencies { implementation "me.champeau.gradle:japicmp-gradle-plugin:0.2.8" - + implementation "com.google.guava:guava:18.0" // required by japicmp-gradle-plugin } gradlePlugin { diff --git a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java index 0f281235ac..931fd10221 100644 --- a/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java +++ b/buildSrc/src/main/java/org/springframework/build/api/ApiDiffPlugin.java @@ -29,6 +29,7 @@ import org.gradle.api.artifacts.Configuration; import org.gradle.api.artifacts.Dependency; import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.plugins.JavaPlugin; +import org.gradle.api.publish.maven.plugins.MavenPublishPlugin; import org.gradle.api.tasks.TaskProvider; import org.gradle.jvm.tasks.Jar; @@ -90,8 +91,7 @@ public class ApiDiffPlugin implements Plugin { private boolean isProjectEligible(Project project) { return project.getPlugins().hasPlugin(JavaPlugin.class) - && !project.getName().equals("spring-core-coroutines") - && !project.getName().equals("spring-framework-bom"); + && project.getPlugins().hasPlugin(MavenPublishPlugin.class); } private Configuration createBaselineConfiguration(String baselineVersion, Project project) {