diff --git a/src/functionalTest/groovy/com/github/spotbugs/snom/StandardFunctionalTest.groovy b/src/functionalTest/groovy/com/github/spotbugs/snom/StandardFunctionalTest.groovy index 1ebd8b4f..eb96eafe 100644 --- a/src/functionalTest/groovy/com/github/spotbugs/snom/StandardFunctionalTest.groovy +++ b/src/functionalTest/groovy/com/github/spotbugs/snom/StandardFunctionalTest.groovy @@ -699,7 +699,7 @@ spotbugsMain { then: result.task(':spotbugsMain').outcome == TaskOutcome.FAILED result.output.contains('See the report at') - def expectedOutput = rootDir.toPath().resolve(Paths.get("build", "reports", "spotbugs", "main.xml")).toUri().toString() + def expectedOutput = rootDir.toPath().toRealPath().resolve(Paths.get("build", "reports", "spotbugs", "main.xml")).toUri().toString() result.output.contains(expectedOutput) where: diff --git a/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java b/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java index 5299aa94..b698621c 100644 --- a/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java +++ b/src/main/groovy/com/github/spotbugs/snom/SpotBugsReport.java @@ -50,8 +50,8 @@ public SpotBugsReport(ObjectFactory objects, SpotBugsTask task) { public abstract String toCommandLineOption(); /** @deprecated use {@link #getOutputLocation()} instead. */ - @Override @Deprecated + @Internal public File getDestination() { return destination.get().getAsFile(); } @@ -75,35 +75,31 @@ public Property getRequired() { /** @deprecated use {@link #getRequired()} instead. */ @Deprecated - @Override + @Internal public boolean isEnabled() { return isRequired.get(); } /** @deprecated use {@code getRequired().set(value)} instead. */ @Deprecated - @Override public void setEnabled(boolean b) { isRequired.set(b); } /** @deprecated use {@code getRequired().set(provider)} instead. */ @Deprecated - @Override public void setEnabled(Provider provider) { isRequired.set(provider); } /** @deprecated use {@code getOutputLocation().set(file)} instead. */ @Deprecated - @Override public void setDestination(File file) { destination.set(file); } /** @deprecated use {@code getOutputLocation().set(provider)} instead. */ @Deprecated - @Override public void setDestination(Provider provider) { destination.set(this.task.getProject().getLayout().file(provider)); } diff --git a/src/main/groovy/com/github/spotbugs/snom/internal/SpotBugsRunnerForHybrid.java b/src/main/groovy/com/github/spotbugs/snom/internal/SpotBugsRunnerForHybrid.java index c56abe32..fb9799f4 100644 --- a/src/main/groovy/com/github/spotbugs/snom/internal/SpotBugsRunnerForHybrid.java +++ b/src/main/groovy/com/github/spotbugs/snom/internal/SpotBugsRunnerForHybrid.java @@ -140,7 +140,7 @@ public void execute() { return; } - String errorMessage = "Verification failed: SpotBugs ended with exit code " + exitValue; + String errorMessage = "Verification failed: SpotBugs ended with exit code " + exitValue + "."; List reportPaths = params.getReports().get().stream() .map(RegularFile::getAsFile) @@ -149,7 +149,7 @@ public void execute() { .map(URI::toString) .collect(Collectors.toList()); if (!reportPaths.isEmpty()) { - errorMessage += "See the report at: " + String.join(",", reportPaths); + errorMessage += " See the report at: " + String.join(",", reportPaths); } throw new GradleException(errorMessage); }