Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[maven] Use source/test roots from session #910

Merged
merged 1 commit into from
Oct 21, 2024
Merged

[maven] Use source/test roots from session #910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/main/groovy/org/codehaus/mojo/spotbugs/BaseViolationCheckMojo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,6 @@ abstract class BaseViolationCheckMojo extends AbstractMojo {
@Parameter(defaultValue = '${project.reporting.outputDirectory}/xref-test')
File xrefTestLocation

/** The directories containing the sources to be compiled. */
@Parameter(defaultValue = '${project.compileSourceRoots}', required = true, readonly = true)
List compileSourceRoots

/**
* The directories containing the test-sources to be compiled.
*
* @since 2.0
*/
@Parameter(defaultValue = '${project.testCompileSourceRoots}', required = true, readonly = true)
List testSourceRoots

/**
* Run Spotbugs on the tests.
*
Expand Down
28 changes: 8 additions & 20 deletions src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,18 +157,6 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
@Parameter(defaultValue = '${project.reporting.outputDirectory}/xref-test')
File xrefTestLocation

/** The directories containing the sources to be compiled. */
@Parameter(defaultValue = '${project.compileSourceRoots}', required = true, readonly = true)
List compileSourceRoots

/**
* The directories containing the test-sources to be compiled.
*
* @since 2.0
*/
@Parameter(defaultValue = '${project.testCompileSourceRoots}', required = true, readonly = true)
List testSourceRoots

/**
* Run Spotbugs on the tests.
*
Expand Down Expand Up @@ -663,8 +651,8 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
generator.setIsJXRReportEnabled(isJxrPluginEnabled)

if (isJxrPluginEnabled) {
generator.setCompileSourceRoots(this.compileSourceRoots)
generator.setTestSourceRoots(this.testSourceRoots)
generator.setCompileSourceRoots(session.getCurrentProject().compileSourceRoots)
generator.setTestSourceRoots(session.getCurrentProject().testCompileSourceRoots)
generator.setXrefLocation(this.xrefLocation)
generator.setXrefTestLocation(this.xrefTestLocation)
generator.setIncludeTests(this.includeTests)
Expand Down Expand Up @@ -723,8 +711,8 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
XDocsReporter xDocsReporter = new XDocsReporter(getBundle(locale), log, threshold, effort, outputEncoding)
xDocsReporter.setOutputWriter(Files.newBufferedWriter(Paths.get("${xmlOutputDirectory}/spotbugs.xml"), Charset.forName(outputEncoding)))
xDocsReporter.setSpotbugsResults(new XmlSlurper().parse(outputSpotbugsFile))
xDocsReporter.setCompileSourceRoots(this.compileSourceRoots)
xDocsReporter.setTestSourceRoots(this.testSourceRoots)
xDocsReporter.setCompileSourceRoots(session.getCurrentProject().compileSourceRoots)
xDocsReporter.setTestSourceRoots(session.getCurrentProject().testCompileSourceRoots)

xDocsReporter.generateReport()
}
Expand Down Expand Up @@ -938,9 +926,9 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug(" Adding Source directories (To process source exclusions)")
args << "-sourcepath"
String sourceRoots = ""
compileSourceRoots.each() { sourceRoots += it + File.pathSeparator }
session.getCurrentProject().compileSourceRoots.each() { sourceRoots += it + File.pathSeparator }
if (includeTests) {
testSourceRoots.each() { sourceRoots + it + File.pathSeparator }
session.getCurrentProject().testCompileSourceRoots.each() { sourceRoots + it + File.pathSeparator }
}
args << sourceRoots.substring(0, sourceRoots.length() -1)
}
Expand Down Expand Up @@ -1149,12 +1137,12 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {

def xmlProject = path.Project

compileSourceRoots.each() { compileSourceRoot ->
session.getCurrentProject().compileSourceRoots.each() { compileSourceRoot ->
xmlProject.appendNode { SrcDir(compileSourceRoot) }
}

if (testClassFilesDirectory.isDirectory() && includeTests) {
testSourceRoots.each() { testSourceRoot ->
session.getCurrentProject().testCompileSourceRoots.each() { testSourceRoot ->
xmlProject.appendNode { SrcDir(testSourceRoot) }
}
}
Expand Down