From 980eb3e81bdba4f3b833f9de3bc9156220830ec3 Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Fri, 13 Sep 2019 16:04:52 -0400 Subject: [PATCH 1/3] stop checkstyling my resources yo --- .../baseline/plugins/BaselineCheckstyle.java | 16 ---------------- .../gradle/junit/XmlReportFailuresSupplier.java | 6 +++++- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.java index 20653cde6..30d7bc167 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineCheckstyle.java @@ -17,10 +17,8 @@ package com.palantir.baseline.plugins; import java.nio.file.Paths; -import java.util.stream.Stream; import org.gradle.api.Project; import org.gradle.api.plugins.JavaPluginConvention; -import org.gradle.api.plugins.quality.Checkstyle; import org.gradle.api.plugins.quality.CheckstyleExtension; import org.gradle.api.plugins.quality.CheckstylePlugin; import org.gradle.api.tasks.javadoc.Javadoc; @@ -55,20 +53,6 @@ public void apply(Project project) { javadoc.options(javadocOptions -> ((StandardJavadocDocletOptions) javadocOptions) .addStringOption("Xdoclint:none", "-quiet"))); } - project.getTasks().withType(Checkstyle.class, checkstyle -> { - // Make checkstyle include files in src/main/resources and src/test/resources, e.g., - // for whitespace checks. - javaConvention.getSourceSets() - .forEach(sourceSet -> sourceSet.getResources().getSrcDirs() - .forEach(resourceDir -> checkstyle.source(resourceDir.toString()))); - // These sources are only checked by gradle, NOT by Eclipse. - Stream.of("checks", "manifests", "scripts", "templates").forEach(checkstyle::source); - // Make sure java files are still included. This should match list in etc/eclipse-template/.checkstyle. - // Currently not enforced, but could be eventually. - Stream.of( - "java", "cfg", "coffee", "erb", "groovy", "handlebars", "json", "less", "pl", "pp", "sh", "xml") - .forEach(extension -> checkstyle.include("**/*." + extension)); - }); }); project.getExtensions().getByType(CheckstyleExtension.class) diff --git a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java index bf5c7b837..0bbbbf27f 100644 --- a/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java +++ b/gradle-junit-reports/src/main/java/com/palantir/gradle/junit/XmlReportFailuresSupplier.java @@ -55,7 +55,11 @@ private XmlReportFailuresSupplier( @Override public List getFailures() throws IOException { File sourceReport = reporting.getReports().findByName("xml").getDestination(); - return XmlUtils.parseXml(reportHandler, new FileInputStream(sourceReport)).failures(); + try { + return XmlUtils.parseXml(reportHandler, new FileInputStream(sourceReport)).failures(); + } catch (Exception e) { + throw new RuntimeException(String.format("Failed to parse failures XML: %s", sourceReport), e); + } } @Override From 3aef6e7a70eeae1bed65af408799cf1e19043ff6 Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Fri, 13 Sep 2019 20:04:52 +0000 Subject: [PATCH 2/3] Add generated changelog entries --- changelog/@unreleased/pr-830.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-830.v2.yml diff --git a/changelog/@unreleased/pr-830.v2.yml b/changelog/@unreleased/pr-830.v2.yml new file mode 100644 index 000000000..c730cd17d --- /dev/null +++ b/changelog/@unreleased/pr-830.v2.yml @@ -0,0 +1,6 @@ +type: fix +fix: + description: Checkstyle tasks only check their own source set and only actual java + sources. They don't look in your `src/*/resources` directory anymore. + links: + - https://github.com/palantir/gradle-baseline/pull/830 From 9a84987555771c73cbd95d674cc9becb5247399e Mon Sep 17 00:00:00 2001 From: Dan Sanduleac Date: Fri, 13 Sep 2019 16:10:55 -0400 Subject: [PATCH 3/3] fix test --- .../com/palantir/baseline/BaselineCheckstyleTest.groovy | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineCheckstyleTest.groovy b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineCheckstyleTest.groovy index b3658360f..f888e5d8d 100644 --- a/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineCheckstyleTest.groovy +++ b/gradle-baseline-java/src/test/groovy/com/palantir/baseline/BaselineCheckstyleTest.groovy @@ -17,14 +17,10 @@ package com.palantir.baseline import com.palantir.baseline.plugins.BaselineCheckstyle -import com.palantir.baseline.plugins.BaselineEclipse -import nebula.test.multiproject.MultiProjectIntegrationHelper import org.gradle.api.Project import org.gradle.api.plugins.quality.Checkstyle import org.gradle.api.plugins.quality.CheckstylePlugin import org.gradle.testfixtures.ProjectBuilder -import org.junit.Rule -import org.junit.rules.TemporaryFolder import spock.lang.Specification class BaselineCheckstyleTest extends Specification { @@ -46,7 +42,7 @@ class BaselineCheckstyleTest extends Specification { project.plugins.hasPlugin(CheckstylePlugin.class) } - def includesResources() { + def doesNotIncludeResources() { def file = new File(project.projectDir, 'src/test/resources/checkstyle.xml') file.getParentFile().mkdirs() when: @@ -57,7 +53,7 @@ class BaselineCheckstyleTest extends Specification { then: def tasks = project.tasks.withType(Checkstyle.class) for (Checkstyle task : tasks) { - assert task.getSource().getFiles().contains(file) + assert !task.getSource().getFiles().contains(file) } } }