From fec158f9a4c8b603bf14c480cb73402ad1f2ef45 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Fri, 23 Aug 2019 00:56:22 +0100 Subject: [PATCH 1/2] Delete FindBugs --- .../main/java/com/palantir/gradle/junit/StyleTaskTimer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/StyleTaskTimer.java b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/StyleTaskTimer.java index ef1665ad3..603b6c950 100644 --- a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/StyleTaskTimer.java +++ b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/StyleTaskTimer.java @@ -19,7 +19,6 @@ import java.util.Map; import org.gradle.api.Task; import org.gradle.api.plugins.quality.Checkstyle; -import org.gradle.api.plugins.quality.FindBugs; import org.gradle.api.tasks.TaskState; import org.gradle.api.tasks.compile.JavaCompile; @@ -55,6 +54,6 @@ public void afterExecute(Task task, TaskState taskState) { } public static boolean isStyleTask(Task task) { - return task instanceof Checkstyle || task instanceof FindBugs || task instanceof JavaCompile; + return task instanceof Checkstyle || task instanceof JavaCompile; } } From 30c483511ef30a850bf2eb66ac8c35441660f97d Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Thu, 22 Aug 2019 23:56:22 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-766.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-766.v2.yml diff --git a/changelog/@unreleased/pr-766.v2.yml b/changelog/@unreleased/pr-766.v2.yml new file mode 100644 index 000000000..6bd70a2a6 --- /dev/null +++ b/changelog/@unreleased/pr-766.v2.yml @@ -0,0 +1,6 @@ +type: improvement +improvement: + description: baseline-circleci no longer integrates with the (deprecated) FindBugs + plugin, as a pre-requisite for Gradle 6.0 compatibility. + links: + - https://github.com/palantir/gradle-baseline/pull/766