*
* @since 1.0-beta-1
*/
- @Parameter( property="findbugs.includeFilterFile" )
+ @Parameter( property="spotbugs.includeFilterFile" )
String includeFilterFile
/**
@@ -251,12 +251,12 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
* This parameter is resolved as resource, URL, then file. If successfully
* resolved, the contents of the configuration is copied into the
* ${project.build.directory}
- * directory before being passed to Findbugs as a filter file.
+ * directory before being passed to Spotbugs as a filter file.
*
*
* @since 1.0-beta-1
*/
- @Parameter( property="findbugs.excludeFilterFile" )
+ @Parameter( property="spotbugs.excludeFilterFile" )
String excludeFilterFile
/**
@@ -272,14 +272,14 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
* This parameter is resolved as resource, URL, then file. If successfully
* resolved, the contents of the configuration is copied into the
* ${project.build.directory}
- * directory before being passed to Findbugs as a filter file.
+ * directory before being passed to Spotbugs as a filter file.
*
*
* This is a comma-delimited list.
*
* @since 2.4.1
*/
- @Parameter( property="findbugs.excludeBugsFile" )
+ @Parameter( property="spotbugs.excludeBugsFile" )
String excludeBugsFile
/**
@@ -287,14 +287,14 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( defaultValue = "Default", property="findbugs.effort" )
+ @Parameter( defaultValue = "Default", property="spotbugs.effort" )
String effort
/**
- * turn on Findbugs debugging
+ * turn on Spotbugs debugging
*
*/
- @Parameter( defaultValue = "false", property="findbugs.debug" )
+ @Parameter( defaultValue = "false", property="spotbugs.debug" )
Boolean debug
/**
@@ -303,7 +303,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( defaultValue = "false", property="findbugs.relaxed" )
+ @Parameter( defaultValue = "false", property="spotbugs.relaxed" )
Boolean relaxed
/**
@@ -311,7 +311,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="findbugs.visitors" )
+ @Parameter( property="spotbugs.visitors" )
String visitors
/**
@@ -319,7 +319,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="findbugs.omitVisitors" )
+ @Parameter( property="spotbugs.omitVisitors" )
String omitVisitors
/**
@@ -335,12 +335,12 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
* This parameter is resolved as resource, URL, then file. If successfully
* resolved, the contents of the configuration is copied into the
* ${project.build.directory}
- * directory before being passed to Findbugs as a plugin file.
+ * directory before being passed to Spotbugs as a plugin file.
*
*
* @since 1.0-beta-1
*/
- @Parameter( property="findbugs.pluginList" )
+ @Parameter( property="spotbugs.pluginList" )
String pluginList
/**
@@ -348,7 +348,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( property="findbugs.onlyAnalyze" )
+ @Parameter( property="spotbugs.onlyAnalyze" )
String onlyAnalyze
/**
@@ -357,7 +357,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.3.2
*/
- @Parameter( property="findbugs.nested", defaultValue = "false" )
+ @Parameter( property="spotbugs.nested", defaultValue = "false" )
Boolean nested
/**
@@ -366,7 +366,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.3.2
*/
- @Parameter( property="findbugs.trace", defaultValue = "false" )
+ @Parameter( property="spotbugs.trace", defaultValue = "false" )
Boolean trace
/**
@@ -374,7 +374,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="findbugs.maxRank" )
+ @Parameter( property="spotbugs.maxRank" )
int maxRank
/**
@@ -382,7 +382,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( property="findbugs.skip", defaultValue = "false" )
+ @Parameter( property="spotbugs.skip", defaultValue = "false" )
boolean skip
/**
@@ -404,15 +404,15 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.0
*/
- @Parameter( property="findbugs.failOnError", defaultValue = "true" )
+ @Parameter( property="spotbugs.failOnError", defaultValue = "true" )
boolean failOnError
/**
- * Fork a VM for FindBugs analysis. This will allow you to set timeouts and heap size
+ * Fork a VM for SpotBugs analysis. This will allow you to set timeouts and heap size
*
* @since 2.3.2
*/
- @Parameter( property="findbugs.fork", defaultValue = "true" )
+ @Parameter( property="spotbugs.fork", defaultValue = "true" )
boolean fork
/**
@@ -421,18 +421,18 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.2
*/
- @Parameter( property="findbugs.maxHeap", defaultValue = "512" )
+ @Parameter( property="spotbugs.maxHeap", defaultValue = "512" )
int maxHeap
/**
- * Specifies the amount of time, in milliseconds, that FindBugs may run before
+ * Specifies the amount of time, in milliseconds, that SpotBugs may run before
* it is assumed to be hung and is terminated.
* The default is 600,000 milliseconds, which is ten minutes.
* This only works if the fork parameter is set true.
*
* @since 2.2
*/
- @Parameter( property="findbugs.timeout", defaultValue = "600000" )
+ @Parameter( property="spotbugs.timeout", defaultValue = "600000" )
int timeout
/**
@@ -442,7 +442,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="findbugs.jvmArgs" )
+ @Parameter( property="spotbugs.jvmArgs" )
String jvmArgs
int bugCount
@@ -453,25 +453,25 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
Locale locale = Locale.getDefault()
List sourceFiles
- log.debug("Executing findbugs:check")
+ log.debug("Executing spotbugs:check")
if ( this.classFilesDirectory.exists() && this.classFilesDirectory.isDirectory() ) {
- sourceFiles = FileUtils.getFiles(classFilesDirectory, FindBugsInfo.JAVA_REGEX_PATTERN, null)
+ sourceFiles = FileUtils.getFiles(classFilesDirectory, SpotBugsInfo.JAVA_REGEX_PATTERN, null)
}
if ( !skip && sourceFiles ) {
// this goes
- log.debug("Here goes...............Executing findbugs:check")
+ log.debug("Here goes...............Executing spotbugs:check")
- if (!findbugsXmlOutputDirectory.exists()) {
- if ( !findbugsXmlOutputDirectory.mkdirs() ) {
+ if (!spotbugsXmlOutputDirectory.exists()) {
+ if ( !spotbugsXmlOutputDirectory.mkdirs() ) {
throw new MojoExecutionException("Cannot create xml output directory")
}
}
- File outputFile = new File("${findbugsXmlOutputDirectory}/findbugsXml.xml")
+ File outputFile = new File("${spotbugsXmlOutputDirectory}/spotbugsXml.xml")
if (outputFile.exists()) {
@@ -497,10 +497,10 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
log.info('Total bugs: ' + total)
for (i in 0..total-1) {
def bug = bugs[i]
- log.info( bug.LongMessage.text() + FindBugsInfo.BLANK + bug.SourceLine.'@classname' + FindBugsInfo.BLANK + bug.SourceLine.Message.text() + FindBugsInfo.BLANK + bug.'@type')
+ log.info( bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK + bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type')
}
- log.info('\n\n\nTo see bug detail using the Findbugs GUI, use the following command "mvn findbugs:gui"\n\n\n')
+ log.info('\n\n\nTo see bug detail using the Spotbugs GUI, use the following command "mvn spotbugs:gui"\n\n\n')
if ( (bugCount || errorCount) && failOnError ) {
throw new MojoExecutionException("failed with ${bugCount} bugs and ${errorCount} errors ")
@@ -508,7 +508,7 @@ class FindbugsViolationCheckMojo extends AbstractMojo {
}
}
else {
- log.debug("Nothing for FindBugs to do here.")
+ log.debug("Nothing for SpotBugs to do here.")
}
}
diff --git a/src/main/groovy/org/codehaus/mojo/findbugs/XDocsReporter.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
similarity index 82%
rename from src/main/groovy/org/codehaus/mojo/findbugs/XDocsReporter.groovy
rename to src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
index 8fe5bbb22..ff7264eb8 100644
--- a/src/main/groovy/org/codehaus/mojo/findbugs/XDocsReporter.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
@@ -1,4 +1,4 @@
-package org.codehaus.mojo.findbugs
+package org.codehaus.mojo.spotbugs
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import groovy.xml.StreamingMarkupBuilder
/**
- * The reporter controls the generation of the FindBugs report.
+ * The reporter controls the generation of the Spotbugs report.
*
* @author Garvin LeClaire
*/
@@ -36,7 +36,7 @@ class XDocsReporter {
* The key to get the value if the line number is not available.
*
*/
- static final String NOLINE_KEY = "report.findbugs.noline"
+ static final String NOLINE_KEY = "report.spotbugs.noline"
/**
* The bundle to get the messages from.
@@ -68,7 +68,7 @@ class XDocsReporter {
*/
Writer outputWriter
- GPathResult findbugsResults
+ GPathResult spotbugsResults
List bugClasses
@@ -101,7 +101,7 @@ class XDocsReporter {
this.outputEncoding = outputEncoding
this.outputWriter = null
- this.findbugsResults = null
+ this.spotbugsResults = null
this.compileSourceRoots = []
this.testSourceRoots = []
@@ -143,13 +143,13 @@ class XDocsReporter {
}
/**
- * Gets the Findbugs Version of the report.
+ * Gets the Spotbugs Version of the report.
*
- * @return The Findbugs Version used on the report.
+ * @return The Spotbugs Version used on the report.
*
*/
- protected String getFindBugsVersion() {
- return edu.umd.cs.findbugs.Version.RELEASE
+ protected String getSpotBugsVersion() {
+ return edu.umd.cs.findbugs.Version.VERSION_STRING
}
public void generateReport() {
@@ -159,13 +159,13 @@ class XDocsReporter {
def xdoc = {
mkp.xmlDeclaration()
- log.debug("generateReport findbugsResults is ${findbugsResults}")
+ log.debug("generateReport spotbugsResults is ${spotbugsResults}")
- BugCollection(version: getFindBugsVersion(), threshold: FindBugsInfo.findbugsThresholds.get(threshold), effort: FindBugsInfo.findbugsEfforts.get(effort)) {
+ BugCollection(version: getSpotBugsVersion(), threshold: SpotBugsInfo.spotbugsThresholds.get(threshold), effort: SpotBugsInfo.spotbugsEfforts.get(effort)) {
- log.debug("findbugsResults.FindBugsSummary total_bugs is ${findbugsResults.FindBugsSummary.@total_bugs.text()}")
+ log.debug("spotbugsResults.FindBugsSummary total_bugs is ${spotbugsResults.FindBugsSummary.@total_bugs.text()}")
- findbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
+ spotbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
def classStatsValue = classStats.'@class'.text()
def classStatsBugCount = classStats.'@bugs'.text()
@@ -182,7 +182,7 @@ class XDocsReporter {
bugClasses.each() {bugClass ->
log.debug("finish bugClass is ${bugClass}")
file(classname: bugClass) {
- findbugsResults.BugInstance.each() {bugInstance ->
+ spotbugsResults.BugInstance.each() {bugInstance ->
if ( bugInstance.Class.find{ it.@primary == "true" }.@classname.text() == bugClass ) {
@@ -201,13 +201,13 @@ class XDocsReporter {
log.debug("Printing Errors")
Error() {
- findbugsResults.Error.analysisError.each() {analysisError ->
+ spotbugsResults.Error.analysisError.each() {analysisError ->
AnalysisError(analysisError.message.text())
}
log.debug("Printing Missing classes")
- findbugsResults.Error.MissingClass.each() {missingClass ->
+ spotbugsResults.Error.MissingClass.each() {missingClass ->
MissingClass(missingClass.text)
}
}
diff --git a/src/main/resources/findbugs.properties b/src/main/resources/findbugs.properties
deleted file mode 100644
index f1c1ce155..000000000
--- a/src/main/resources/findbugs.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Category
-report.findbugs.column.class=Class
-report.findbugs.column.classes=Classes
-report.findbugs.column.details=Details
-report.findbugs.column.errors=Errors
-report.findbugs.column.files=Files
-report.findbugs.column.missingclasses=Missing Classes
-report.findbugs.column.line=Line
-report.findbugs.column.priority=Priority
-report.findbugs.description=Generates a source code report with the FindBugs Library.
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.files=Files
-report.findbugs.summary=Summary
-report.findbugs.javasources=Found java sources (Class files):
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=The following document contains the results of
-report.findbugs.name=FindBugs
-report.findbugs.noline=Not available
-report.findbugs.reporttitle=FindBugs Bug Detector Report
-report.findbugs.sourceRoot=Using source root:
-report.findbugs.testSourceRoot=Using test source root:
-report.findbugs.threshold=Threshold is
-report.findbugs.effort=Effort is
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.versiontitle=FindBugs Version is
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/findbugs_en.properties b/src/main/resources/findbugs_en.properties
deleted file mode 100644
index f1c1ce155..000000000
--- a/src/main/resources/findbugs_en.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Category
-report.findbugs.column.class=Class
-report.findbugs.column.classes=Classes
-report.findbugs.column.details=Details
-report.findbugs.column.errors=Errors
-report.findbugs.column.files=Files
-report.findbugs.column.missingclasses=Missing Classes
-report.findbugs.column.line=Line
-report.findbugs.column.priority=Priority
-report.findbugs.description=Generates a source code report with the FindBugs Library.
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.files=Files
-report.findbugs.summary=Summary
-report.findbugs.javasources=Found java sources (Class files):
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=The following document contains the results of
-report.findbugs.name=FindBugs
-report.findbugs.noline=Not available
-report.findbugs.reporttitle=FindBugs Bug Detector Report
-report.findbugs.sourceRoot=Using source root:
-report.findbugs.testSourceRoot=Using test source root:
-report.findbugs.threshold=Threshold is
-report.findbugs.effort=Effort is
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.versiontitle=FindBugs Version is
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/findbugs_es.properties b/src/main/resources/findbugs_es.properties
deleted file mode 100644
index 8359ef065..000000000
--- a/src/main/resources/findbugs_es.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Categoría
-report.findbugs.column.class=Clase
-report.findbugs.column.classes=Clases
-report.findbugs.column.details=Detalles
-report.findbugs.column.errors=Errores
-report.findbugs.column.files=Archivos
-report.findbugs.column.missingclasses=Classes Faltantes
-report.findbugs.column.line=Línea
-report.findbugs.column.priority=Prioridad
-report.findbugs.description=Genera un reporte del código fuente con la Librería FindBugs.
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.files=Archivos
-report.findbugs.summary=Resumen
-report.findbugs.javasources=Fuentes java encontrados (Archivos class):
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=El siguiente documento contiene los resultados de
-report.findbugs.name=FindBugs
-report.findbugs.noline=No disponible
-report.findbugs.reporttitle=Reporte FindBugs Bug Detector
-report.findbugs.sourceRoot=Utilizando raíz de fuentes:
-report.findbugs.testSourceRoot=Utilizando raíz de fuentes de test:
-report.findbugs.threshold=El umbral es
-report.findbugs.effort=El esfuerzo es
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.versiontitle=La versión de FindBugs es
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/findbugs_fr.properties b/src/main/resources/findbugs_fr.properties
deleted file mode 100644
index 574f39e60..000000000
--- a/src/main/resources/findbugs_fr.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Cat\u00e9gorie
-report.findbugs.column.class=Classe
-report.findbugs.column.classes=Classes
-report.findbugs.column.details=D\u00e9tails
-report.findbugs.column.errors=Erreurs
-report.findbugs.column.files=Fichiers
-report.findbugs.column.missingclasses=Classes Manquantes
-report.findbugs.column.line=Ligne
-report.findbugs.column.priority=Priorit\u00e9
-report.findbugs.description=G\u00e9n\u00e8re un rapport du code source avec la librairie FindBugs.
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.files=Fichiers
-report.findbugs.summary=R\u00e9sum\u00e9
-report.findbugs.javasources=Sources java trouv\u00e9es (Classes):
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=Le document suivant contient les r\u00e9sultats du
-report.findbugs.name=FindBugs
-report.findbugs.noline=Non disponible
-report.findbugs.reporttitle=Rapport FindBugs de d\u00e9tection des bugs
-report.findbugs.sourceRoot=Utilise la racine des sources :
-report.findbugs.testSourceRoot=Utilise la racine des sources de test :
-report.findbugs.threshold=La limite est
-report.findbugs.effort=L'effort est
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.versiontitle=La version de FindBugs est
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/findbugs_no_NO.properties b/src/main/resources/findbugs_no_NO.properties
deleted file mode 100644
index bd9928c36..000000000
--- a/src/main/resources/findbugs_no_NO.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Kategori
-report.findbugs.column.class=Klasse
-report.findbugs.column.classes=Klasser
-report.findbugs.column.details=Detaljer
-report.findbugs.column.errors=Feil
-report.findbugs.column.files=Filer
-report.findbugs.column.missingclasses=Manglende Klasser
-report.findbugs.column.line=Linje
-report.findbugs.column.priority=Prioritet
-report.findbugs.description=Genererer en kildekode rapport med FindBugs biblioteket
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.files=Filer
-report.findbugs.summary=Sammendrag
-report.findbugs.javasources=Fant java kildefiler (Klasse files):
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=Dokumentet best�r av f�lgende resultater
-report.findbugs.name=FindBugs
-report.findbugs.noline=Ikke tilgjengelig
-report.findbugs.reporttitle=FindBugs Bug Deteksjons Report
-report.findbugs.sourceRoot=Bruker kildetre:
-report.findbugs.testSourceRoot=Bruker test kildetre:
-report.findbugs.threshold=Grenseverdi er
-report.findbugs.effort=Innsatsvilje er
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.versiontitle=FindBugs Versjon er
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/findbugs_pt_BR.properties b/src/main/resources/findbugs_pt_BR.properties
deleted file mode 100644
index 896483a45..000000000
--- a/src/main/resources/findbugs_pt_BR.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-report.findbugs.column.bug=Bug
-report.findbugs.column.bugs=Bugs
-report.findbugs.column.category=Categoria
-report.findbugs.column.class=Classe
-report.findbugs.column.classes=Classes
-report.findbugs.column.details=Detalhes
-report.findbugs.column.errors=Erros
-report.findbugs.column.files=Arquivos
-report.findbugs.column.line=Linhas
-report.findbugs.column.missingclasses=Classes n\u00E3o Encontradas
-report.findbugs.column.priority=Prioridade
-report.findbugs.description=Gera um relat\u00F3rio do c\u00F3digo fonte utilizando o FindBugs.
-report.findbugs.detailslink=http://findbugs.sourceforge.net/bugDescriptions.html
-report.findbugs.effort=Esfor\u00E7o\:
-report.findbugs.files=Arquivos
-report.findbugs.javasources=C\u00F3digo Java encontrado\:
-report.findbugs.jxrplugin.artifactid=maven-jxr-plugin
-report.findbugs.link=http://findbugs.sourceforge.net
-report.findbugs.linktitle=O seguinte documento cont\u00E9m os resultados do
-report.findbugs.name=FindBugs
-report.findbugs.noline=Indispon\u00EDvel
-report.findbugs.reporttitle=Relat\u00F3rio do FindBugs Bug Detector
-report.findbugs.sourceRoot=Verificando c\u00F3digo a partir de\:
-report.findbugs.summary=Sum\u00E1rio
-report.findbugs.testSourceRoot=Verificando c\u00F3digo de testes a partir de\:
-report.findbugs.threshold=Limite\:
-report.findbugs.versiontitle=A vers\u00E3o do FindBugs \u00E9 a
-report.findbugs.coreplugin=findbugs
diff --git a/src/main/resources/spotbugs.properties b/src/main/resources/spotbugs.properties
new file mode 100644
index 000000000..e783fe99b
--- /dev/null
+++ b/src/main/resources/spotbugs.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Category
+report.spotbugs.column.class=Class
+report.spotbugs.column.classes=Classes
+report.spotbugs.column.details=Details
+report.spotbugs.column.errors=Errors
+report.spotbugs.column.files=Files
+report.spotbugs.column.missingclasses=Missing Classes
+report.spotbugs.column.line=Line
+report.spotbugs.column.priority=Priority
+report.spotbugs.description=Generates a source code report with the SpotBugs Library.
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.files=Files
+report.spotbugs.summary=Summary
+report.spotbugs.javasources=Found java sources (Class files):
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=The following document contains the results of
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=Not available
+report.spotbugs.reporttitle=SpotBugs Bug Detector Report
+report.spotbugs.sourceRoot=Using source root:
+report.spotbugs.testSourceRoot=Using test source root:
+report.spotbugs.threshold=Threshold is
+report.spotbugs.effort=Effort is
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.versiontitle=SpotBugs Version is
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/resources/spotbugs_en.properties b/src/main/resources/spotbugs_en.properties
new file mode 100644
index 000000000..e783fe99b
--- /dev/null
+++ b/src/main/resources/spotbugs_en.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Category
+report.spotbugs.column.class=Class
+report.spotbugs.column.classes=Classes
+report.spotbugs.column.details=Details
+report.spotbugs.column.errors=Errors
+report.spotbugs.column.files=Files
+report.spotbugs.column.missingclasses=Missing Classes
+report.spotbugs.column.line=Line
+report.spotbugs.column.priority=Priority
+report.spotbugs.description=Generates a source code report with the SpotBugs Library.
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.files=Files
+report.spotbugs.summary=Summary
+report.spotbugs.javasources=Found java sources (Class files):
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=The following document contains the results of
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=Not available
+report.spotbugs.reporttitle=SpotBugs Bug Detector Report
+report.spotbugs.sourceRoot=Using source root:
+report.spotbugs.testSourceRoot=Using test source root:
+report.spotbugs.threshold=Threshold is
+report.spotbugs.effort=Effort is
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.versiontitle=SpotBugs Version is
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/resources/spotbugs_es.properties b/src/main/resources/spotbugs_es.properties
new file mode 100644
index 000000000..dde97b91e
--- /dev/null
+++ b/src/main/resources/spotbugs_es.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Categoría
+report.spotbugs.column.class=Clase
+report.spotbugs.column.classes=Clases
+report.spotbugs.column.details=Detalles
+report.spotbugs.column.errors=Errores
+report.spotbugs.column.files=Archivos
+report.spotbugs.column.missingclasses=Classes Faltantes
+report.spotbugs.column.line=Línea
+report.spotbugs.column.priority=Prioridad
+report.spotbugs.description=Genera un reporte del código fuente con la Librería SpotBugs.
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.files=Archivos
+report.spotbugs.summary=Resumen
+report.spotbugs.javasources=Fuentes java encontrados (Archivos class):
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=El siguiente documento contiene los resultados de
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=No disponible
+report.spotbugs.reporttitle=Reporte SpotBugs Bug Detector
+report.spotbugs.sourceRoot=Utilizando raíz de fuentes:
+report.spotbugs.testSourceRoot=Utilizando raíz de fuentes de test:
+report.spotbugs.threshold=El umbral es
+report.spotbugs.effort=El esfuerzo es
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.versiontitle=La versión de SpotBugs es
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/resources/spotbugs_fr.properties b/src/main/resources/spotbugs_fr.properties
new file mode 100644
index 000000000..f4ac3c118
--- /dev/null
+++ b/src/main/resources/spotbugs_fr.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Cat\u00e9gorie
+report.spotbugs.column.class=Classe
+report.spotbugs.column.classes=Classes
+report.spotbugs.column.details=D\u00e9tails
+report.spotbugs.column.errors=Erreurs
+report.spotbugs.column.files=Fichiers
+report.spotbugs.column.missingclasses=Classes Manquantes
+report.spotbugs.column.line=Ligne
+report.spotbugs.column.priority=Priorit\u00e9
+report.spotbugs.description=G\u00e9n\u00e8re un rapport du code source avec la librairie SpotBugs.
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.files=Fichiers
+report.spotbugs.summary=R\u00e9sum\u00e9
+report.spotbugs.javasources=Sources java trouv\u00e9es (Classes):
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=Le document suivant contient les r\u00e9sultats du
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=Non disponible
+report.spotbugs.reporttitle=Rapport SpotBugs de d\u00e9tection des bugs
+report.spotbugs.sourceRoot=Utilise la racine des sources :
+report.spotbugs.testSourceRoot=Utilise la racine des sources de test :
+report.spotbugs.threshold=La limite est
+report.spotbugs.effort=L'effort est
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.versiontitle=La version de SpotBugs est
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/resources/spotbugs_no_NO.properties b/src/main/resources/spotbugs_no_NO.properties
new file mode 100644
index 000000000..e67586710
--- /dev/null
+++ b/src/main/resources/spotbugs_no_NO.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Kategori
+report.spotbugs.column.class=Klasse
+report.spotbugs.column.classes=Klasser
+report.spotbugs.column.details=Detaljer
+report.spotbugs.column.errors=Feil
+report.spotbugs.column.files=Filer
+report.spotbugs.column.missingclasses=Manglende Klasser
+report.spotbugs.column.line=Linje
+report.spotbugs.column.priority=Prioritet
+report.spotbugs.description=Genererer en kildekode rapport med SpotBugs biblioteket
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.files=Filer
+report.spotbugs.summary=Sammendrag
+report.spotbugs.javasources=Fant java kildefiler (Klasse files):
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=Dokumentet best�r av f�lgende resultater
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=Ikke tilgjengelig
+report.spotbugs.reporttitle=SpotBugs Bug Deteksjons Report
+report.spotbugs.sourceRoot=Bruker kildetre:
+report.spotbugs.testSourceRoot=Bruker test kildetre:
+report.spotbugs.threshold=Grenseverdi er
+report.spotbugs.effort=Innsatsvilje er
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.versiontitle=SpotBugs Versjon er
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/resources/spotbugs_pt_BR.properties b/src/main/resources/spotbugs_pt_BR.properties
new file mode 100644
index 000000000..145bcee16
--- /dev/null
+++ b/src/main/resources/spotbugs_pt_BR.properties
@@ -0,0 +1,28 @@
+report.spotbugs.column.bug=Bug
+report.spotbugs.column.bugs=Bugs
+report.spotbugs.column.category=Categoria
+report.spotbugs.column.class=Classe
+report.spotbugs.column.classes=Classes
+report.spotbugs.column.details=Detalhes
+report.spotbugs.column.errors=Erros
+report.spotbugs.column.files=Arquivos
+report.spotbugs.column.line=Linhas
+report.spotbugs.column.missingclasses=Classes n\u00E3o Encontradas
+report.spotbugs.column.priority=Prioridade
+report.spotbugs.description=Gera um relat\u00F3rio do c\u00F3digo fonte utilizando o SpotBugs.
+report.spotbugs.detailslink=https://spotbugs.readthedocs.io/en/latest/bugDescriptions.html
+report.spotbugs.effort=Esfor\u00E7o\:
+report.spotbugs.files=Arquivos
+report.spotbugs.javasources=C\u00F3digo Java encontrado\:
+report.spotbugs.jxrplugin.artifactid=maven-jxr-plugin
+report.spotbugs.link=https://spotbugs.github.io/
+report.spotbugs.linktitle=O seguinte documento cont\u00E9m os resultados do
+report.spotbugs.name=SpotBugs
+report.spotbugs.noline=Indispon\u00EDvel
+report.spotbugs.reporttitle=Relat\u00F3rio do SpotBugs Bug Detector
+report.spotbugs.sourceRoot=Verificando c\u00F3digo a partir de\:
+report.spotbugs.summary=Sum\u00E1rio
+report.spotbugs.testSourceRoot=Verificando c\u00F3digo de testes a partir de\:
+report.spotbugs.threshold=Limite\:
+report.spotbugs.versiontitle=A vers\u00E3o do SpotBugs \u00E9 a
+report.spotbugs.coreplugin=spotbugs
diff --git a/src/main/tools/annotations.pom b/src/main/tools/annotations.pom
deleted file mode 100644
index 43daaa5b6..000000000
--- a/src/main/tools/annotations.pom
+++ /dev/null
@@ -1,22 +0,0 @@
-
- 4.0.0
- com.google.code.findbugs
- annotations
- @findbugs.version@
- jar
- http://findbugs.sourceforge.net/
- FindBugs-Annotations
- Annotation supports the FindBugs tool
-
-
- GNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
- repo
-
-
-
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
-
-
diff --git a/src/main/tools/bcel.pom b/src/main/tools/bcel.pom
deleted file mode 100644
index 6f6191479..000000000
--- a/src/main/tools/bcel.pom
+++ /dev/null
@@ -1,22 +0,0 @@
-
- 4.0.0
- com.google.code.findbugs
- bcel
- @findbugs.version@
- jar
- http://findbugs.sourceforge.net/
- FindBugs-bcel
- Modified BCEL for Findbugs
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
-
-
diff --git a/src/main/tools/fb2bundle.groovy b/src/main/tools/fb2bundle.groovy
index 118a69884..c91997e21 100644
--- a/src/main/tools/fb2bundle.groovy
+++ b/src/main/tools/fb2bundle.groovy
@@ -1,15 +1,15 @@
#!/usr/bin/env groovy
-def cli = new CliBuilder(usage:'fb2bundle -f findbugs.home -version version')
+def cli = new CliBuilder(usage:'fb2bundle -f spotbugs.home -version version')
cli.h(longOpt: 'help', 'usage information')
-cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Findbugs version')
+cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Spotbugs version')
def opt = cli.parse(args)
if (!opt) { return }
if (opt.h) opt.usage()
-def findbugsVersion = opt.v
+def spotbugsVersion = opt.v
-println "findbugsVersion is ${findbugsVersion}"
+println "spotbugsVersion is ${spotbugsVersion}"
println "Done parsing"
def cmdPrefix = """"""
@@ -18,11 +18,11 @@ println "os.name is " + System.getProperty("os.name")
if (System.getProperty("os.name").toLowerCase().contains("windows")) cmdPrefix = """cmd /c """
-def modules = ["annotations", "bcel", "findbugs", "findbugs-ant", "jFormatString", "jsr305" ]
+def modules = ["spotbugs-annotations", "spotbugs", "spotbugs-ant", "jFormatString", "jsr305" ]
modules.each(){ module ->
println "Processing ${module}........"
- cmd = cmdPrefix + """mvn repository:bundle-pack -B -DgroupId=com.google.code.findbugs -DartifactId=${module} -Dversion=${findbugsVersion}"""
+ cmd = cmdPrefix + """mvn repository:bundle-pack -B -DgroupId=com.github.spotbugs -DartifactId=${module} -Dversion=${spotbugsVersion}"""
proc = cmd.execute()
println proc.text
}
diff --git a/src/main/tools/fb2local.groovy b/src/main/tools/fb2local.groovy
index 6c33a8de8..a2f94c859 100644
--- a/src/main/tools/fb2local.groovy
+++ b/src/main/tools/fb2local.groovy
@@ -1,23 +1,21 @@
#!groovy
-// fb2local -f /opt/findbugs/findbugs-2.0.0-rc2 -v 2.0.0-rc2
-
-def findbugsHome = System.getenv("FINDBUGS_HOME")
+def spotbugsHome = System.getenv("SPOTBUGS_HOME")
def antBuilder = new AntBuilder()
-def cli = new CliBuilder(usage:'fb2local -f findbugs.home -version version')
+def cli = new CliBuilder(usage:'fb2local -f spotbugs.home -version version')
cli.h(longOpt: 'help', 'usage information')
-cli.f(argName: 'home', longOpt: 'home', required: false, args: 1, type:GString, 'Findbugs home directory')
-cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Findbugs version')
+cli.f(argName: 'home', longOpt: 'home', required: false, args: 1, type:GString, 'Spotbugs home directory')
+cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Spotbugs version')
def opt = cli.parse(args)
if (!opt) { return }
if (opt.h) opt.usage()
-if (opt.f) findbugsHome = opt.f
-def findbugsVersion = opt.v
+if (opt.f) spotbugsHome = opt.f
+def spotbugsVersion = opt.v
-println "findbugsHome is ${findbugsHome}"
-println "findbugsVersion is ${findbugsVersion}"
+println "spotbugsHome is ${spotbugsHome}"
+println "spotbugsVersion is ${spotbugsVersion}"
println "Done parsing"
def cmdPrefix = """"""
@@ -26,16 +24,16 @@ println "os.name is " + System.getProperty("os.name")
if (System.getProperty("os.name").toLowerCase().contains("windows")) cmdPrefix = """cmd /c """
-def modules = ["annotations", "bcel", "findbugs", "findbugs-ant", "jFormatString", "jsr305" ]
+def modules = ["spotbugs-annotations", "spotbugs", "spotbugs-ant", "jFormatString", "jsr305" ]
modules.each(){ module ->
antBuilder.copy(file: new File("${module}.pom"), toFile: new File("${module}.xml"), overwrite: true ) {
filterset() {
- filter(token: "findbugs.version", value: "${findbugsVersion}")
+ filter(token: "spotbugs.version", value: "${spotbugsVersion}")
}
}
- cmd = cmdPrefix + """mvn install:install-file -DpomFile=${module}.xml -Dfile=${findbugsHome}/lib/${module}.jar -DgroupId=com.google.code.findbugs -DartifactId=${module} -Dversion=${findbugsVersion} -Dpackaging=jar"""
+ cmd = cmdPrefix + """mvn install:install-file -DpomFile=${module}.xml -Dfile=${spotbugsHome}/lib/${module}.jar -DgroupId=com.github.spotbugs -DartifactId=${module} -Dversion=${spotbugsVersion} -Dpackaging=jar"""
proc = cmd.execute()
println proc.text
}
diff --git a/src/main/tools/fb2repo.groovy b/src/main/tools/fb2repo.groovy
index 88f7bd011..c0f49fcea 100644
--- a/src/main/tools/fb2repo.groovy
+++ b/src/main/tools/fb2repo.groovy
@@ -1,26 +1,23 @@
#!/usr/bin/env groovy
-// fb2repo -f /opt/findbugs/findbugs-2.0.0 -v 2.0.0 -url file:///Users/user/NetBeansProjects/findbugs-repo/rc-repository
-// fb2repo -f /opt/findbugs/findbugs-2.0.0 -v 2.0.0 -url file:///Users/user/NetBeansProjects/findbugs-repo/release-repository
-
-def findbugsHome = System.getenv("FINDBUGS_HOME")
+def spotbugsHome = System.getenv("SPOTBUGS_HOME")
def antBuilder = new AntBuilder()
-def cli = new CliBuilder(usage:'fb2repo -f findbugs.home -version version -u repositoryURL')
+def cli = new CliBuilder(usage:'fb2repo -f spotbugs.home -version version -u repositoryURL')
cli.h(longOpt: 'help', 'usage information')
-cli.f(argName: 'home', longOpt: 'home', required: false, args: 1, type:GString, 'Findbugs home directory')
-cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Findbugs version')
+cli.f(argName: 'home', longOpt: 'home', required: false, args: 1, type:GString, 'Spotbugs home directory')
+cli.v(argName: 'version', longOpt: 'version', required: true, args: 1, type:GString, 'Spotbugs version')
cli.u(argName: 'url', longOpt: 'url', required: true, args: 1, type:GString, 'Repository URL')
def opt = cli.parse(args)
if (!opt) { return }
if (opt.h) opt.usage()
-if (opt.f) findbugsHome = opt.f
-def findbugsVersion = opt.v
+if (opt.f) spotbugsHome = opt.f
+def spotbugsVersion = opt.v
def repoUrl = opt.u
-println "findbugsHome is ${findbugsHome}"
-println "findbugsVersion is ${findbugsVersion}"
+println "spotbugsHome is ${spotbugsHome}"
+println "spotbugsVersion is ${spotbugsVersion}"
println "Done parsing"
def cmdPrefix = """"""
@@ -29,16 +26,16 @@ println "os.name is " + System.getProperty("os.name")
if (System.getProperty("os.name").toLowerCase().contains("windows")) cmdPrefix = """cmd /c """
-def modules = ["annotations", "bcel", "findbugs", "findbugs-ant", "jFormatString", "jsr305" ]
+def modules = ["annotations", "bcel", "spotbugs", "spotbugs-ant", "jFormatString", "jsr305" ]
modules.each(){ module ->
antBuilder.copy(file: new File("${module}.pom"), toFile: new File("${module}.xml"), overwrite: true ) {
filterset() {
- filter(token: "findbugs.version", value: "${findbugsVersion}")
+ filter(token: "spotbugs.version", value: "${spotbugsVersion}")
}
}
- cmd = cmdPrefix + """mvn deploy:deploy-file -DpomFile=${module}.xml -Dfile=${findbugsHome}/lib/${module}.jar -DgroupId=com.google.code.findbugs -DartifactId=${module} -Dversion=${findbugsVersion} -Durl=${repoUrl} -Dpackaging=jar"""
+ cmd = cmdPrefix + """mvn deploy:deploy-file -DpomFile=${module}.xml -Dfile=${spotbugsHome}/lib/${module}.jar -DgroupId=com.github.spotbugs -DartifactId=${module} -Dversion=${spotbugsVersion} -Durl=${repoUrl} -Dpackaging=jar"""
proc = cmd.execute()
println proc.text
antBuilder.delete(file: "pom.xml")
diff --git a/src/main/tools/findbugs-ant.pom b/src/main/tools/findbugs-ant.pom
deleted file mode 100644
index f07dae29b..000000000
--- a/src/main/tools/findbugs-ant.pom
+++ /dev/null
@@ -1,29 +0,0 @@
-
- 4.0.0
- com.google.code.findbugs
- findbugs-ant
- @findbugs.version@
- jar
- http://findbugs.sourceforge.net/
- FindBugs-AntTask
- AntTask to run Findbugs
-
-
- GNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
- repo
-
-
-
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
-
-
-
- com.google.code.findbugs
- findbugs
- @findbugs.version@
-
-
-
diff --git a/src/main/tools/jFormatString.pom b/src/main/tools/jFormatString.pom
index c91743a49..4c6fa38c4 100644
--- a/src/main/tools/jFormatString.pom
+++ b/src/main/tools/jFormatString.pom
@@ -1,12 +1,12 @@
4.0.0
- com.google.code.findbugs
+ com.github.spotbugsjFormatString
- @findbugs.version@
+ @Spotbugs.version@jar
- http://findbugs.sourceforge.net/
- FindBugs-jFormatString
- jFormatString for Findbugs
+ http://www.github.com/spotbugs/
+ SpotBugs-jFormatString
+ jFormatString for SpotbugsGNU Lesser Public License
@@ -15,8 +15,8 @@
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
+ scm:git:https://github.com/spotbugs/spotbugs.git
+ scm:git:ssh://git@github.com/spotbugs/spotbugs.git
+ https://github.com/spotbugs/spotbugs
diff --git a/src/main/tools/jsr305.pom b/src/main/tools/jsr305.pom
index 5c04c377f..c4b99c88c 100644
--- a/src/main/tools/jsr305.pom
+++ b/src/main/tools/jsr305.pom
@@ -1,12 +1,12 @@
4.0.0
- com.google.code.findbugs
+ com.github.spotbugsjsr305
- @findbugs.version@
+ @spotbugs.version@jar
- http://findbugs.sourceforge.net/
- FindBugs-jsr305
- JSR305 Annotations for Findbugs
+ http://spotbugs.sourceforge.net/
+ SpotBugs-jsr305
+ JSR305 Annotations for SpotbugsThe Apache Software License, Version 2.0
@@ -15,8 +15,8 @@
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
+ scm:git:https://code.google.com/p/jsr-305/
+ scm:git:https://code.google.com/p/jsr-305/
+ https://code.google.com/p/jsr-305/
diff --git a/src/main/tools/spotbugs-annotations.pom b/src/main/tools/spotbugs-annotations.pom
new file mode 100644
index 000000000..56d7cb307
--- /dev/null
+++ b/src/main/tools/spotbugs-annotations.pom
@@ -0,0 +1,23 @@
+
+ 4.0.0
+ com.github.spotbugs
+ spotbugs-annotations
+ @spotbugs.version@
+ jar
+ https://spotbugs.github.io/
+ SpotBugs-Annotations
+ Annotation supports the SpotBugs tool
+
+
+ GNU Lesser Public License
+ http://www.gnu.org/licenses/lgpl.html
+ repo
+
+
+
+ scm:git:https://github.com/spotbugs/spotbugs.git
+ scm:git:ssh://git@github.com/spotbugs/spotbugs.git
+ https://github.com/spotbugs/spotbugs
+ HEAD
+
+
diff --git a/src/main/tools/spotbugs-ant.pom b/src/main/tools/spotbugs-ant.pom
new file mode 100644
index 000000000..91566e99a
--- /dev/null
+++ b/src/main/tools/spotbugs-ant.pom
@@ -0,0 +1,30 @@
+
+ 4.0.0
+ com.github.spotbugs
+ spotbugs-ant
+ @spotbugs.version@
+ jar
+ https://spotbugs.github.io/
+ SpotBugs-AntTask
+ AntTask to run Spotbugs
+
+
+ GNU Lesser Public License
+ http://www.gnu.org/licenses/lgpl.html
+ repo
+
+
+
+ scm:git:https://github.com/spotbugs/spotbugs.git
+ scm:git:ssh://git@github.com/spotbugs/spotbugs.git
+ https://github.com/spotbugs/spotbugs
+ HEAD
+
+
+
+ com.github.spotbugs
+ spotbugs
+ @spotbugs.version@
+
+
+
diff --git a/src/main/tools/findbugs.pom b/src/main/tools/spotbugs.pom
similarity index 68%
rename from src/main/tools/findbugs.pom
rename to src/main/tools/spotbugs.pom
index 1db057d79..128499412 100644
--- a/src/main/tools/findbugs.pom
+++ b/src/main/tools/spotbugs.pom
@@ -1,12 +1,12 @@
4.0.0
- com.google.code.findbugs
- findbugs
- @findbugs.version@
+ com.github.spotbugs
+ spotbugs
+ @spotbugs.version@jar
- http://findbugs.sourceforge.net/
- FindBugs
- Findbugs: Because it's easy!
+ https://spotbugs.github.io/
+ SpotBugs
+ Spotbugs: Because it's easy!GNU Lesser Public License
@@ -15,30 +15,31 @@
- scm:svn:http://findbugs.googlecode.com/svn/trunk/
- scm:svn:https://findbugs.googlecode.com/svn/trunk/
- http://findbugs.googlecode.com/svn/trunk/
+ scm:git:https://github.com/spotbugs/spotbugs.git
+ scm:git:ssh://git@github.com/spotbugs/spotbugs.git
+ https://github.com/spotbugs/spotbugs
+ HEAD
- com.google.code.findbugs
+ com.github.spotbugsbcel
- @findbugs.version@
+ @spotbugs.version@
- com.google.code.findbugs
+ com.github.spotbugsjsr305
- @findbugs.version@
+ @spotbugs.version@
- com.google.code.findbugs
+ com.github.spotbugsjFormatString
- @findbugs.version@
+ @spotbugs.version@
- com.google.code.findbugs
+ com.github.spotbugsannotations
- @findbugs.version@
+ @spotbugs.version@dom4j
diff --git a/src/site/apt/examples/multi-module-config.apt.vm b/src/site/apt/examples/multi-module-config.apt.vm
index b6577808b..ca8509c8c 100644
--- a/src/site/apt/examples/multi-module-config.apt.vm
+++ b/src/site/apt/examples/multi-module-config.apt.vm
@@ -27,13 +27,13 @@
Multimodule Configuration
- <> This implemented in version 2.0 of the Findbugs plugin.
+ <> This implemented in version 2.0 of the Spotbugs plugin.
<> This is a shameless plagiarization of the Checkstyle
plugin for consistency and due to my laziness.
- Configuring the Findbugs plugin for use within large multimodule projects
+ Configuring the Spotbugs plugin for use within large multimodule projects
can be done, but it requires a little setup.
This example will use a mysterious project called . This is what
@@ -56,7 +56,7 @@ whizbang
We'll start by adding another sub project that will house our common
configuration. Let's call it . In it we put the resources that
we want to include. In this example, we will add configuration files for the
- Findbugs plugin. Configuration files for other plugins, like the PMD and
+ Spotbugs plugin. Configuration files for other plugins, like the PMD and
Checkstyle plugin, can be included in the same subproject if you like.
We will create another directory and call it and create a pom.xml
file. We will move our core, gui, and jmx modules to .
@@ -106,7 +106,7 @@ whizbang
* Configure the other projects to build-tools
- Now we can include the Findbugs configuration in the whiz-progs <<>>.
+ Now we can include the Spotbugs configuration in the whiz-progs <<>>.
+-----+
@@ -132,8 +132,8 @@ whizbang
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}Max
@@ -152,10 +152,10 @@ whizbang
+-----+
Once you are done with that, ensure that you do not include
- findbugs-maven-plugin in your sub modules, as their definition and
+ spotbugs-maven-plugin in your sub modules, as their definition and
configuration, will override the top level parent pom's definition.
- Based on the Findbugs plugin configuration above, the values of
+ Based on the Spotbugs plugin configuration above, the values of
<<>> will be resolved from the
classpath. The jar was included in the classpath when it was
declared as an dependency to the plugin.
@@ -171,4 +171,4 @@ whizbang
mvn site
+-----+
- Every sub project will now use the same Findbugs setup and configuration.
+ Every sub project will now use the same Spotbugs setup and configuration.
diff --git a/src/site/apt/examples/violationChecking.apt.vm b/src/site/apt/examples/violationChecking.apt.vm
index 783902b31..411fda7e0 100644
--- a/src/site/apt/examples/violationChecking.apt.vm
+++ b/src/site/apt/examples/violationChecking.apt.vm
@@ -26,8 +26,8 @@
Violation Checking
- The <<>> goal allows you to configure your build to fail if any errors are found
- in the FindBugs report.
+ The <<>> goal allows you to configure your build to fail if any errors are found
+ in the SpotBugs report.
The following code fragment enables the check in a build during the <<>> phase.
The check will fail if any of the filter triggers in the include file are met.
@@ -38,8 +38,8 @@ Violation Checking
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}Max
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index 9cbd18bfe..3a6c7c203 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -6,11 +6,11 @@
-FindBugs Maven Plugin
+SpotBugs Maven Plugin
-*Please Note - This version is using Findbugs ${findbugsVersion}.
+*Please Note - This version is using Spotbugs ${spotbugsVersion}.
- FindBugs looks for bugs in Java programs. It is based on the concept of bug patterns. A bug pattern is a code idiom that is often an error. Bug patterns arise for a variety of reasons:
+ SpotBugs looks for bugs in Java programs. It is based on the concept of bug patterns. A bug pattern is a code idiom that is often an error. Bug patterns arise for a variety of reasons:
* Difficult language features
@@ -20,16 +20,16 @@ FindBugs Maven Plugin
* Garden variety mistakes: typos, use of the wrong boolean operator
- FindBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. We have found that FindBugs finds real errors in most Java software. Because its analysis is sometimes imprecise, FindBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by FindBugs is generally less than 50%.
+ SpotBugs uses static analysis to inspect Java bytecode for occurrences of bug patterns. We have found that SpotBugs finds real errors in most Java software. Because its analysis is sometimes imprecise, SpotBugs can report false warnings, which are warnings that do not indicate real errors. In practice, the rate of false warnings reported by SpotBugs is generally less than 50%.
- FindBugs is free software, available under the terms of the Lesser GNU Public License. It is written in Java, and can be run with any virtual machine compatible with Java 7. It can analyze programs written for any version of Java. FindBugs was originally developed by Bill Pugh. It is maintained by Bill Pugh, David Hovemeyer, and a team of volunteers.
+ SpotBugs is free software, available under the terms of the Lesser GNU Public License. It is written in Java, and can be run with any virtual machine compatible with Java 8. It can analyze programs written for any version of Java. SpotBugs was originally developed by Bill Pugh. It is maintained by Bill Pugh, David Hovemeyer, and a team of volunteers.
- FindBugs uses BCEL to analyze Java bytecode. It uses dom4j for XML manipulation.
+ SpotBugs uses BCEL to analyze Java bytecode. It uses dom4j for XML manipulation.
- This introduction is an excerpt from the Facts Sheet at {{{http://findbugs.sourceforge.net/factSheet.html}FindBugs home page}}.
+ This introduction is an excerpt from the Facts Sheet at {{{http://spotbugs.sourceforge.net/factSheet.html}SpotBugs home page}}.
- To see more documentation about FindBugs' options, please see the {{{http://findbugs.sourceforge.net/manual/index.html}FindBugs Manual}}.
+ To see more documentation about SpotBugs' options, please see the {{{http://spotbugs.sourceforge.net/manual/index.html}SpotBugs Manual}}.
*Please Note
- As of version 3.0.0, you will need to use JDK 7 to run this plugin. This is a requirement imposed by Findbugs.
+ As of version 3.1.0, you will need to use JDK 8 to run this plugin. This is a requirement imposed by Spotbugs.
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 40013d565..67d7f321a 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -26,12 +26,12 @@
Usage
${projectVersion}
- The following examples describe the basic usage of the FindBugs plugin.
+ The following examples describe the basic usage of the SpotBugs plugin.
-* Generate FindBugs Report As Part of the Project Reports
+* Generate SpotBugs Report As Part of the Project Reports
- To generate the FindBugs report as part of the Project Reports, add the
- FindBugs plugin in the <<<\>>> section
+ To generate the SpotBugs report as part of the Project Reports, add the
+ SpotBugs plugin in the <<<\>>> section
of your <<>>.
+-----+
@@ -40,8 +40,8 @@ Usage
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}
@@ -56,13 +56,13 @@ Usage
mvn site
+-----+
-* Generate FindBugs xdoc Report As Part of the Project Reports
+* Generate SpotBugs xdoc Report As Part of the Project Reports
- To generate the FindBugs xdoc report as part of the Project Reports, add the
- FindBugs plugin in the <<<\>>> section
- of your <<>>. This will be the same report as that of the Maven 1 FindBugs
+ To generate the SpotBugs xdoc report as part of the Project Reports, add the
+ SpotBugs plugin in the <<<\>>> section
+ of your <<>>. This will be the same report as that of the Maven 1 SpotBugs
report. It is also the format used by Hudson.
- The output file will be written as <<>> to either the default output
+ The output file will be written as <<>> to either the default output
directory of $\{project.build.directory\} or by that started in the
<<<\>>> option.
@@ -72,12 +72,12 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}true
-
+
target/site
@@ -101,7 +101,7 @@ mvn site
you can use filters.
The filters allow specifying by class and method which bug categories to
include/exclude in/from the reports. The
- {{{http://findbugs.sourceforge.net/manual/filter.html}filter format specification}}
+ {{{http://spotbugs.sourceforge.net/manual/filter.html}filter format specification}}
also contains useful examples.
+-----+
@@ -110,12 +110,12 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}
- findbugs-exclude.xml
- findbugs-include.xml
+ spotbugs-exclude.xml
+ spotbugs-include.xml
@@ -139,7 +139,7 @@ mvn site
you can use filters.
The filters allow specifying by class and method which bug categories to
include/exclude in/from the reports. The
- {{{http://findbugs.sourceforge.net/manual/filter.html}filter format specification}}
+ {{{http://spotbugs.sourceforge.net/manual/filter.html}filter format specification}}
also contains useful examples.
+-----+
@@ -148,12 +148,12 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}
- findbugs-exclude.xml
- findbugs-include.xml
+ spotbugs-exclude.xml
+ spotbugs-include.xml
@@ -183,8 +183,8 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}FindDeadLocalStores,UnreadFields
@@ -215,8 +215,8 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}FindDeadLocalStores,UnreadFields
@@ -247,11 +247,11 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}
- org.codehaus.mojo.findbugs.*
+ com.github.spotbugs.spotbugs.*
@@ -280,8 +280,8 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}myDetectors.jar, yourDetectors.jar
@@ -311,14 +311,14 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}com.timgroup
- findbugs4jmock
+ spotbugs4jmock0.2
@@ -338,10 +338,10 @@ mvn site
+-----+
-* Launch the Findbugs GUI
+* Launch the Spotbugs GUI
- This will launch the FindBugs GUI configured for this project and will open the
- findbugsXml.xml file if present. It therefore assumes a pom.xml with the minimum
+ This will launch the SpotBugs GUI configured for this project and will open the
+ spotbugsXml.xml file if present. It therefore assumes a pom.xml with the minimum
as follows.
+-----+
@@ -350,11 +350,11 @@ mvn site
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin${projectVersion}
-
+
@@ -363,10 +363,10 @@ mvn site
+-----+
- Then, execute the findbugs plugin with the gui option.
+ Then, execute the spotbugs plugin with the gui option.
+-----+
-mvn findbugs:gui
+mvn spotbugs:gui
+-----+
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index a118b9dd5..9a6e05f5e 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -21,8 +21,8 @@
How do I avoid OutOfMemory errors?
- When running findbugs on a project, the default heap size might not be enough
- to complete the build. For now there is no way to fork findbugs and run with
+ When running spotbugs on a project, the default heap size might not be enough
+ to complete the build. For now there is no way to fork spotbugs and run with
its own memory requirements, but the following system variable will allow you
to do so for Maven:
diff --git a/src/site/resources/examples/findbugsXml.xml b/src/site/resources/examples/findbugsXml.xml
deleted file mode 100644
index 73cce200e..000000000
--- a/src/site/resources/examples/findbugsXml.xml
+++ /dev/null
@@ -1,417 +0,0 @@
-
-/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/it/basic-1/target/classes/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/it/basic-1/target/test-classes/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/mojo/findbugs-maven-plugin/3.0.3-SNAPSHOT/findbugs-maven-plugin-3.0.3-SNAPSHOT.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/com/google/code/findbugs/findbugs/3.0.1/findbugs-3.0.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/net/jcip/jcip-annotations/1.0/jcip-annotations-1.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/com/google/code/findbugs/bcel-findbugs/6.0/bcel-findbugs-6.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/com/google/code/findbugs/jFormatString/2.0.1/jFormatString-2.0.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/ow2/asm/asm-debug-all/5.0.2/asm-debug-all-5.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/ow2/asm/asm-commons/5.0.2/asm-commons-5.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/ow2/asm/asm-tree/5.0.2/asm-tree-5.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/ow2/asm/asm/5.0.2/asm-5.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-lang/commons-lang/2.6/commons-lang-2.6.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/com/apple/AppleJavaExtensions/1.4/AppleJavaExtensions-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/jaxen/jaxen/1.1.6/jaxen-1.1.6.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/ant/ant/1.9.4/ant-1.9.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/ant/ant-launcher/1.9.4/ant-launcher-1.9.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/groovy/groovy-all/2.4.3/groovy-all-2.4.3.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/reporting/maven-reporting-impl/2.1/maven-reporting-impl-2.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-interpolation/1.1/plexus-interpolation-1.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-validator/commons-validator/1.2.0/commons-validator-1.2.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-digester/commons-digester/1.6/commons-digester-1.6.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/oro/oro/2.0.8/oro-2.0.8.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/doxia/doxia-core/1.4/doxia-core-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/doxia/doxia-logging-api/1.4/doxia-logging-api-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/httpcomponents/httpclient/4.0.2/httpclient-4.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-codec/commons-codec/1.3/commons-codec-1.3.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/httpcomponents/httpcore/4.0.1/httpcore-4.0.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/doxia/doxia-decoration-model/1.4/doxia-decoration-model-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/doxia/doxia-module-xhtml/1.4/doxia-module-xhtml-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/doxia/doxia-module-fml/1.4/doxia-module-fml-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/velocity/velocity/1.5/velocity-1.5.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-chain/commons-chain/1.1/commons-chain-1.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/sslext/sslext/1.2-0/sslext-1.2-0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/antlr/antlr/2.7.2/antlr-2.7.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/apache/maven/shared/maven-doxia-tools/1.2.1/maven-doxia-tools-1.2.1.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/commons-io/commons-io/1.4/commons-io-1.4.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-resources/1.0-alpha-7/plexus-resources-1.0-alpha-7.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/sonatype/plexus/plexus-build-api/0.0.7/plexus-build-api-0.0.7.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/it/basic-1/target/test-classes/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/junit/junit/4.11/junit-4.11.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/jboss/jboss-j2ee/4.0.2/jboss-j2ee-4.0.2.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/local-repo/org/mortbay/jetty/servlet-api/2.5-6.0.0/servlet-api-2.5-6.0.0.jar/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/it-src-findbugs/java/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/src/it-src/test/java/Users/garvin/gitProjects/Findbugs/findbugs-maven-plugin/target/it/basic-1/targetClass inherits equals() and uses Object.hashCode()AbstractMissingHashCode$StillMissingHashCode inherits equals and uses Object.hashCode()At AbstractMissingHashCode.java:[line 14]In class AbstractMissingHashCode$StillMissingHashCodeAt AbstractMissingHashCode.java:[line 14]Unused fieldUnused field: AbstractMissingHashCode$StillMissingHashCode.yAt AbstractMissingHashCode.java:[line 14]In class AbstractMissingHashCode$StillMissingHashCodeIn AbstractMissingHashCode.javaField AbstractMissingHashCode$StillMissingHashCode.yIn AbstractMissingHashCode.javaShould be a static inner classShould AccidentalNonConstructorInInnerClass$DoNotReport be a _static_ inner class?At AccidentalNonConstructorInInnerClass.java:[lines 21-24]In class AccidentalNonConstructorInInnerClass$DoNotReportAt AccidentalNonConstructorInInnerClass.java:[lines 21-24]Should be a static inner classShould AccidentalNonConstructorInInnerClass$Report be a _static_ inner class?At AccidentalNonConstructorInInnerClass.java:[lines 3-7]In class AccidentalNonConstructorInInnerClass$ReportAt AccidentalNonConstructorInInnerClass.java:[lines 3-7]Doomed attempt to append to an object output streamDoomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject1(File, Object)At AppendingToAnObjectOutputStream.java:[lines 11-36]In class AppendingToAnObjectOutputStreamIn method AppendingToAnObjectOutputStream.appendObject1(File, Object)At AppendingToAnObjectOutputStream.java:[line 15]Doomed attempt to append to an object output streamDoomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject2(File, Object)At AppendingToAnObjectOutputStream.java:[lines 11-36]In class AppendingToAnObjectOutputStreamIn method AppendingToAnObjectOutputStream.appendObject2(File, Object)At AppendingToAnObjectOutputStream.java:[line 21]Doomed attempt to append to an object output streamDoomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject3(String, Object)At AppendingToAnObjectOutputStream.java:[lines 11-36]In class AppendingToAnObjectOutputStreamIn method AppendingToAnObjectOutputStream.appendObject3(String, Object)At AppendingToAnObjectOutputStream.java:[line 27]Doomed attempt to append to an object output streamDoomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject4(String, Object)At AppendingToAnObjectOutputStream.java:[lines 11-36]In class AppendingToAnObjectOutputStreamIn method AppendingToAnObjectOutputStream.appendObject4(String, Object)At AppendingToAnObjectOutputStream.java:[line 33]Invocation of toString on an unnamed arrayInvocation of toString on an unnamed array in ArrayToString.print2()At ArrayToString.java:[lines 4-35]In class ArrayToStringIn method ArrayToString.print2()At ArrayToString.java:[line 29]Invocation of toString on an arrayInvocation of toString on ? in ArrayToString.print0(String[])At ArrayToString.java:[lines 4-35]In class ArrayToStringIn method ArrayToString.print0(String[])Local variable stored in JVM register 1At ArrayToString.java:[line 18]Invocation of toString on an arrayInvocation of toString on ? in ArrayToString.print1()At ArrayToString.java:[lines 4-35]In class ArrayToStringIn method ArrayToString.print1()Local variable stored in JVM register 1At ArrayToString.java:[line 24]Invocation of toString on an arrayInvocation of toString on gargs in ArrayToString.print3()At ArrayToString.java:[lines 4-35]In class ArrayToStringIn method ArrayToString.print3()In ArrayToString.javaValue loaded from field ArrayToString.gargsAt ArrayToString.java:[line 34]Bad comparison of signed byteBad comparison of signed byte with 200 in AssumeUnsignedBytes.find200(byte[])At AssumeUnsignedBytes.java:[lines 3-10]In class AssumeUnsignedBytesIn method AssumeUnsignedBytes.find200(byte[])Value 200At AssumeUnsignedBytes.java:[line 8]Unusual equals method UseOfNonHashableClassInHashDataStructure.equals(Object) is unusualAt UseOfNonHashableClassInHashDataStructure.java:[lines 3-23]In class UseOfNonHashableClassInHashDataStructureIn method UseOfNonHashableClassInHashDataStructure.equals(Object)At UseOfNonHashableClassInHashDataStructure.java:[line 14]Class defines equals() and uses Object.hashCode()UseOfNonHashableClassInHashDataStructure defines equals and uses Object.hashCode()At UseOfNonHashableClassInHashDataStructure.java:[lines 3-23]In class UseOfNonHashableClassInHashDataStructureIn method UseOfNonHashableClassInHashDataStructure.equals(Object)At UseOfNonHashableClassInHashDataStructure.java:[line 14]Use of class without a hashCode() method in a hashed data structureUseOfNonHashableClassInHashDataStructure doesn't define a hashCode() method but is used in a hashed data structure in UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure)At UseOfNonHashableClassInHashDataStructure.java:[lines 3-23]In class UseOfNonHashableClassInHashDataStructureIn method UseOfNonHashableClassInHashDataStructure.get(UseOfNonHashableClassInHashDataStructure)At UseOfNonHashableClassInHashDataStructure.java:[lines 3-23]Unhashable class UseOfNonHashableClassInHashDataStructure Called method java.util.HashMap.get(Object)At UseOfNonHashableClassInHashDataStructure.java:[line 23]equals() method does not check for null argumentUseOfNonHashableClassInHashDataStructure.equals(Object) does not check for null argumentAt UseOfNonHashableClassInHashDataStructure.java:[lines 3-23]In class UseOfNonHashableClassInHashDataStructureIn method UseOfNonHashableClassInHashDataStructure.equals(Object)Parameter $L1At UseOfNonHashableClassInHashDataStructure.java:[line 14]Dead store to local variableDead store to $L2 in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)Local variable stored in JVM register 2At UselessAssignments.java:[line 11]Another occurrence at UselessAssignments.java:[line 13]Overwritten incrementOverwritten increment in UselessAssignments.oops()At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method UselessAssignments.oops()At UselessAssignments.java:[line 24]Double assignment of fieldDouble assignment of field g1 in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)In UselessAssignments.javaField UselessAssignments.g1In UselessAssignments.javaDid you mean to refer to the field UselessAssignments.g2?At UselessAssignments.java:[line 12]Double assignment of fieldDouble assignment of field foo in UselessAssignments.oops()At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method UselessAssignments.oops()In UselessAssignments.javaField UselessAssignments.fooAt UselessAssignments.java:[line 25]Another occurrence at UselessAssignments.java:[line 26]Double assignment of fieldDouble assignment of field foo in UselessAssignments.report(UselessAssignments, UselessAssignments)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method UselessAssignments.report(UselessAssignments, UselessAssignments)In UselessAssignments.javaField UselessAssignments.fooAt UselessAssignments.java:[line 31]Double assignment of fieldDouble assignment of field bar in UselessAssignments.setFoo(UselessAssignments, UselessAssignments)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method UselessAssignments.setFoo(UselessAssignments, UselessAssignments)In UselessAssignments.javaField UselessAssignments.barAt UselessAssignments.java:[line 18]Self assignment of fieldSelf assignment of field foo in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)In UselessAssignments.javaField UselessAssignments.fooDid you mean to refer to the local variable ?At UselessAssignments.java:[line 10]Self assignment of fieldSelf assignment of field foo in UselessAssignments.oops()At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method UselessAssignments.oops()In UselessAssignments.javaField UselessAssignments.fooAt UselessAssignments.java:[line 25]Double assignment of local variable Double assignment of $L3 in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)Local variable stored in JVM register 3At UselessAssignments.java:[line 13]Self assignment of local variableSelf assignment of $L2 in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)Local variable stored in JVM register 2At UselessAssignments.java:[line 11]Unread fieldUnread field: UselessAssignments.barAt UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn UselessAssignments.javaField UselessAssignments.barAt UselessAssignments.java:[line 18]Unread fieldUnread field: UselessAssignments.g1At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn UselessAssignments.javaField UselessAssignments.g1At UselessAssignments.java:[line 12]Uninitialized read of field in constructorUninitialized read of foo in new UselessAssignments(int, int)At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn method new UselessAssignments(int, int)In UselessAssignments.javaField UselessAssignments.fooDid you mean to refer to the local variable ?At UselessAssignments.java:[line 10]Unused fieldUnused field: UselessAssignments.g2At UselessAssignments.java:[lines 8-35]In class UselessAssignmentsIn UselessAssignments.javaField UselessAssignments.g2In UselessAssignments.javaUseless control flowUseless control flow in UselessControlFlow.report2(Object, Object)At UselessControlFlow.java:[lines 2-40]In class UselessControlFlowIn method UselessControlFlow.report2(Object, Object)At UselessControlFlow.java:[line 23]Useless control flow to next lineUseless control flow to next line in UselessControlFlow.report0(Object, Object)At UselessControlFlow.java:[lines 2-40]In class UselessControlFlowIn method UselessControlFlow.report0(Object, Object)At UselessControlFlow.java:[line 14]Useless control flow to next lineUseless control flow to next line in UselessControlFlow.report1(Object, Object)At UselessControlFlow.java:[lines 2-40]In class UselessControlFlowIn method UselessControlFlow.report1(Object, Object)At UselessControlFlow.java:[line 18]Useless non-empty void methodMethod UselessControlFlow.report4(Object[], Object) seems to be uselessAt UselessControlFlow.java:[lines 2-40]In class UselessControlFlowIn method UselessControlFlow.report4(Object[], Object)At UselessControlFlow.java:[line 40]Static Thread.interrupted() method invoked on thread instanceUselessCurrentThread.run() invokes static Thread.interrupted() method on thread instanceAt UselessCurrentThread.java:[lines 5-36]In class UselessCurrentThreadIn method UselessCurrentThread.run()At UselessCurrentThread.java:[line 29]Finalizer does nothing but call superclass finalizerUselessFinalize.finalize() does nothing except call super.finalize(); delete itAt UselessFinalize.java:[lines 1-5]In class UselessFinalizeIn method UselessFinalize.finalize()At UselessFinalize.java:[lines 4-5]Dead store to local variableDead store to $L3 in UserMistakes.main(String[])At UserMistakes.java:[lines 11-47]In class UserMistakesIn method UserMistakes.main(String[])Local variable stored in JVM register 3At UserMistakes.java:[line 31]Code contains a hard coded reference to an absolute pathnameHard coded reference to an absolute pathname in UserMistakes.main(String[])At UserMistakes.java:[lines 11-47]In class UserMistakesIn method UserMistakes.main(String[])File name /mainList.txtAt UserMistakes.java:[line 29]Another occurrence at UserMistakes.java:[line 42]Reliance on default encodingFound reliance on default encoding in UserMistakes.main(String[]): new java.io.FileReader(String)At UserMistakes.java:[lines 11-47]In class UserMistakesIn method UserMistakes.main(String[])Called method new java.io.FileReader(String)At UserMistakes.java:[line 29]Another occurrence at UserMistakes.java:[line 42]"." or "|" used for regular expression"." or "|" used for regular expression in UserMistakes.main(String[])At UserMistakes.java:[lines 11-47]In class UserMistakesIn method UserMistakes.main(String[])Called method String.replaceAll(String, String)At UserMistakes.java:[line 15]Method discards result of readLine after checking if it is non-nullUserMistakes.main(String[]) discards result of readLine after checking if it is non-nullAt UserMistakes.java:[lines 11-47]In class UserMistakesIn method UserMistakes.main(String[])At UserMistakes.java:[line 30]equals() used to compare array and nonarrayCalling String[].equals(String) in equals.ArrayEquality.reportProblemsWithArrayEquality(String[], String)At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality(String[], String)At String.java:[lines 108-3095]Actual type StringExpected String[]Value loaded from ?At ArrayEquality.java:[line 8]equals() used to compare array and nonarrayCalling String.equals(String[]) in equals.ArrayEquality.reportProblemsWithArrayEquality2(String[], String)At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality2(String[], String)Actual type String[]At String.java:[lines 108-3095]Expected StringValue loaded from ?At ArrayEquality.java:[line 12]Invocation of equals() on an array, which is equivalent to ==Using .equals to compare two String[]'s, (equivalent to ==) in equals.ArrayEquality.reportProblemsWithArrayEquality3(String[], String[])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality3(String[], String[])Actual type String[]Expected String[]Value loaded from ?At ArrayEquality.java:[line 15]equals(...) used to compare incompatible arraysUsing equals to compare a String[] and a String[][] in equals.ArrayEquality.reportProblemsWithArrayEquality4(String[][], String[])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality4(String[][], String[])Actual type String[]Expected String[][]Value loaded from ?At ArrayEquality.java:[line 18]equals(...) used to compare incompatible arraysUsing equals to compare a String[][] and a String[] in equals.ArrayEquality.reportProblemsWithArrayEquality5(String[], String[][])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality5(String[], String[][])Actual type String[][]Expected String[]Value loaded from ?At ArrayEquality.java:[line 21]equals(...) used to compare incompatible arraysUsing equals to compare a int[] and a String[] in equals.ArrayEquality.reportProblemsWithArrayEquality6(String[], int[])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality6(String[], int[])Actual type int[]Expected String[]Value loaded from ?At ArrayEquality.java:[line 24]equals(...) used to compare incompatible arraysUsing equals to compare a String[] and a int[] in equals.ArrayEquality.reportProblemsWithArrayEquality7(int[], String[])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality7(int[], String[])Actual type String[]Expected int[]Value loaded from ?At ArrayEquality.java:[line 27]equals(...) used to compare incompatible arraysUsing equals to compare a String[] and a StringBuffer[] in equals.ArrayEquality.reportProblemsWithArrayEquality8(StringBuffer[], String[])At ArrayEquality.java:[lines 5-36]In class equals.ArrayEqualityIn method equals.ArrayEquality.reportProblemsWithArrayEquality8(StringBuffer[], String[])Actual type String[]Expected StringBuffer[]Value loaded from ?At ArrayEquality.java:[line 30]Impossible castImpossible cast from java.util.LinkedList to java.util.ArrayList in gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])At AllListsCouldBeEqual.java:[lines 12-156]In class gcUnrelatedTypes.AllListsCouldBeEqualIn method gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])At LinkedList.java:[lines 85-1137]Actual type java.util.LinkedListAt ArrayList.java:[lines 102-966]Expected java.util.ArrayListValue loaded from ?At AllListsCouldBeEqual.java:[line 134]Dead store to local variableDead store to $L2 in gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])At AllListsCouldBeEqual.java:[lines 12-156]In class gcUnrelatedTypes.AllListsCouldBeEqualIn method gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])Local variable stored in JVM register 2At AllListsCouldBeEqual.java:[line 134]Null pointer dereferenceNull pointer dereference of ? in gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])At AllListsCouldBeEqual.java:[lines 12-156]In class gcUnrelatedTypes.AllListsCouldBeEqualIn method gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])Value loaded from ?Dereferenced at AllListsCouldBeEqual.java:[line 138]Return value of method without side effect is ignoredReturn value of java.util.Set.contains(Object) ignored, but method has no side effectAt AllListsCouldBeEqual.java:[lines 12-156]In class gcUnrelatedTypes.AllListsCouldBeEqualIn method gcUnrelatedTypes.AllListsCouldBeEqual.falsePositive()Called method java.util.Set.contains(Object)At AllListsCouldBeEqual.java:[line 152]Another occurrence at AllListsCouldBeEqual.java:[line 153]Return value of method without side effect is ignoredReturn value of java.util.List.contains(Object) ignored, but method has no side effectAt AllListsCouldBeEqual.java:[lines 12-156]In class gcUnrelatedTypes.AllListsCouldBeEqualIn method gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])Called method java.util.List.contains(Object)At AllListsCouldBeEqual.java:[line 138]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$Dummy in new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 9]Expected gcUnrelatedTypes.ArrayListContains$DummyCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 64]Another occurrence at ArrayListContains.java:[line 68]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$DummyChild in new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 13]Expected gcUnrelatedTypes.ArrayListContains$DummyChildCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 76]Another occurrence at ArrayListContains.java:[line 80]No relationship between generic parameter and method argumentString is incompatible with expected argument type Object in new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt Object.java:[lines 37-553]Expected ObjectCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 72]Another occurrence at ArrayListContains.java:[line 84]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$Dummy in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 9]Expected gcUnrelatedTypes.ArrayListContains$DummyCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.dummyEF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 116]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$Dummy in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 9]Expected gcUnrelatedTypes.ArrayListContains$DummyCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.dummyF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 112]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$DummyChild in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 13]Expected gcUnrelatedTypes.ArrayListContains$DummyChildCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.childEF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 128]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains$DummyChild in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt ArrayListContains.java:[line 13]Expected gcUnrelatedTypes.ArrayListContains$DummyChildCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.childF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 124]No relationship between generic parameter and method argumentString is incompatible with expected argument type Object in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt Object.java:[lines 37-553]Expected ObjectCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.childSF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 132]No relationship between generic parameter and method argumentString is incompatible with expected argument type Object in gcUnrelatedTypes.ArrayListContains.testFields()At ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()At String.java:[lines 108-3095]Actual type StringAt Object.java:[lines 37-553]Expected ObjectCalled method java.util.ArrayList.contains(Object)In ArrayListContains.javaInvoked on gcUnrelatedTypes.ArrayListContains.dummySF? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains.java:[line 120]Return value of method without side effect is ignoredReturn value of java.util.ArrayList.contains(Object) ignored, but method has no side effectAt ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)Called method java.util.ArrayList.contains(Object)At ArrayListContains.java:[line 58]Another occurrence at ArrayListContains.java:[line 59]Another occurrence at ArrayListContains.java:[line 60]Another occurrence at ArrayListContains.java:[line 62]Another occurrence at ArrayListContains.java:[line 63]Another occurrence at ArrayListContains.java:[line 64]Another occurrence at ArrayListContains.java:[line 66]Another occurrence at ArrayListContains.java:[line 67]Another occurrence at ArrayListContains.java:[line 68]Another occurrence at ArrayListContains.java:[line 70]Another occurrence at ArrayListContains.java:[line 71]Another occurrence at ArrayListContains.java:[line 72]Another occurrence at ArrayListContains.java:[line 74]Another occurrence at ArrayListContains.java:[line 75]Another occurrence at ArrayListContains.java:[line 76]Another occurrence at ArrayListContains.java:[line 78]Another occurrence at ArrayListContains.java:[line 79]Another occurrence at ArrayListContains.java:[line 80]Another occurrence at ArrayListContains.java:[line 82]Another occurrence at ArrayListContains.java:[line 83]Another occurrence at ArrayListContains.java:[line 84]Another occurrence at ArrayListContains.java:[line 86]Another occurrence at ArrayListContains.java:[line 87]Another occurrence at ArrayListContains.java:[line 88]Another occurrence at ArrayListContains.java:[line 90]Another occurrence at ArrayListContains.java:[line 91]Another occurrence at ArrayListContains.java:[line 92]Another occurrence at ArrayListContains.java:[line 94]Another occurrence at ArrayListContains.java:[line 95]Another occurrence at ArrayListContains.java:[line 96]Return value of method without side effect is ignoredReturn value of java.util.ArrayList.contains(Object) ignored, but method has no side effectAt ArrayListContains.java:[lines 42-150]In class gcUnrelatedTypes.ArrayListContainsIn method gcUnrelatedTypes.ArrayListContains.testFields()Called method java.util.ArrayList.contains(Object)At ArrayListContains.java:[line 106]Another occurrence at ArrayListContains.java:[line 107]Another occurrence at ArrayListContains.java:[line 108]Another occurrence at ArrayListContains.java:[line 110]Another occurrence at ArrayListContains.java:[line 111]Another occurrence at ArrayListContains.java:[line 112]Another occurrence at ArrayListContains.java:[line 114]Another occurrence at ArrayListContains.java:[line 115]Another occurrence at ArrayListContains.java:[line 116]Another occurrence at ArrayListContains.java:[line 118]Another occurrence at ArrayListContains.java:[line 119]Another occurrence at ArrayListContains.java:[line 120]Another occurrence at ArrayListContains.java:[line 122]Another occurrence at ArrayListContains.java:[line 123]Another occurrence at ArrayListContains.java:[line 124]Another occurrence at ArrayListContains.java:[line 126]Another occurrence at ArrayListContains.java:[line 127]Another occurrence at ArrayListContains.java:[line 128]Another occurrence at ArrayListContains.java:[line 130]Another occurrence at ArrayListContains.java:[line 131]Another occurrence at ArrayListContains.java:[line 132]Another occurrence at ArrayListContains.java:[line 134]Another occurrence at ArrayListContains.java:[line 135]Another occurrence at ArrayListContains.java:[line 136]Another occurrence at ArrayListContains.java:[line 138]Another occurrence at ArrayListContains.java:[line 139]Another occurrence at ArrayListContains.java:[line 140]Another occurrence at ArrayListContains.java:[line 142]Another occurrence at ArrayListContains.java:[line 143]Another occurrence at ArrayListContains.java:[line 144]Dead store to local variableDead store to $L11 in new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In method new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)Local variable stored in JVM register 11At ArrayListContains0.java:[line 42]Another occurrence at ArrayListContains0.java:[line 43]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains0$Dummy in new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In method new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt ArrayListContains0.java:[line 7]Expected gcUnrelatedTypes.ArrayListContains0$DummyCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains0.java:[line 48]Another occurrence at ArrayListContains0.java:[line 50]No relationship between generic parameter and method argumentString is incompatible with expected argument type ArrayListContains0$DummyChild in new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In method new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt ArrayListContains0.java:[line 11]Expected gcUnrelatedTypes.ArrayListContains0$DummyChildCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains0.java:[line 54]Another occurrence at ArrayListContains0.java:[line 56]No relationship between generic parameter and method argumentString is incompatible with expected argument type Object in new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In method new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)At String.java:[lines 108-3095]Actual type StringAt Object.java:[lines 37-553]Expected ObjectCalled method java.util.ArrayList.contains(Object)Invoked on ?? passed as argumentString.equals(Object) used to determine equalityAt ArrayListContains0.java:[line 52]Another occurrence at ArrayListContains0.java:[line 58]Return value of method without side effect is ignoredReturn value of java.util.ArrayList.contains(Object) ignored, but method has no side effectAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In method new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)Called method java.util.ArrayList.contains(Object)At ArrayListContains0.java:[line 46]Another occurrence at ArrayListContains0.java:[line 48]Another occurrence at ArrayListContains0.java:[line 50]Another occurrence at ArrayListContains0.java:[line 52]Another occurrence at ArrayListContains0.java:[line 54]Another occurrence at ArrayListContains0.java:[line 56]Another occurrence at ArrayListContains0.java:[line 58]Unused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.childEFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.childEFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.childFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.childFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.childSFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.childSFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.dummyEFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.dummyEFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.dummyFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.dummyFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.dummySFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.dummySFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.genericEFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.genericEFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.genericFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.genericFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.genericSFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.genericSFIn ArrayListContains0.javaUnused fieldUnused field: gcUnrelatedTypes.ArrayListContains0.wildcardFAt ArrayListContains0.java:[lines 40-63]In class gcUnrelatedTypes.ArrayListContains0In ArrayListContains0.javaField gcUnrelatedTypes.ArrayListContains0.wildcardFIn ArrayListContains0.javaNullcheck of value previously dereferencedNullcheck of UseCheckUse.x at line 10 of value previously dereferenced in npe.UseCheckUse.f(boolean)At UseCheckUse.java:[lines 5-17]In class npe.UseCheckUseIn method npe.UseCheckUse.f(boolean)In UseCheckUse.javaValue loaded from field npe.UseCheckUse.xAt UseCheckUse.java:[line 9]Redundant null check at UseCheckUse.java:[line 10]Null pointer dereferenceNull pointer dereference of ? in nullnessAnnotations.UseAnnotations.bar2()At UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.bar2()Value loaded from ?Dereferenced at UseAnnotations.java:[line 36]Method call passes null to a non-null parameter Null passed for non-null parameter of g(Object) in nullnessAnnotations.UseAnnotations.foo2()At UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.foo2()Called method nullnessAnnotations.UseAnnotations.g(Object)Argument 1 is definitely null but must not be nullAt UseAnnotations.java:[line 20]Possible null pointer dereferencePossible null pointer dereference of ? in nullnessAnnotations.UseAnnotations.bar3(int)At UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.bar3(int)Value loaded from ?Dereferenced at UseAnnotations.java:[line 41]Null value at UseAnnotations.java:[line 39]Known null at UseAnnotations.java:[line 40]Possible null pointer dereferencePossible null pointer dereference of ? in nullnessAnnotations.UseAnnotations.bar4(int)At UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.bar4(int)Value loaded from ?Dereferenced at UseAnnotations.java:[line 46]Null value at UseAnnotations.java:[line 44]Known null at UseAnnotations.java:[line 45]Possible null pointer dereference due to return value of called methodPossible null pointer dereference in nullnessAnnotations.UseAnnotations.bar() due to return value of called methodAt UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.bar()Local variable stored in JVM register ?Dereferenced at UseAnnotations.java:[line 32]Known null at UseAnnotations.java:[line 32]Possible null pointer dereference due to return value of called methodPossible null pointer dereference in nullnessAnnotations.UseAnnotations.foo() due to return value of called methodAt UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.foo()Local variable stored in JVM register ?Method invoked at UseAnnotations.java:[line 17]Known null at UseAnnotations.java:[line 17]Possible null pointer dereference due to return value of called methodPossible null pointer dereference in nullnessAnnotations.UseAnnotations.foo4() due to return value of called methodAt UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.foo4()Local variable stored in JVM register ?Dereferenced at UseAnnotations.java:[line 28]Known null at UseAnnotations.java:[line 28]Method call passes null for non-null parameterNull passed for non-null parameter of g(Object) in nullnessAnnotations.UseAnnotations.foo3(int)At UseAnnotations.java:[lines 6-46]In class nullnessAnnotations.UseAnnotationsIn method nullnessAnnotations.UseAnnotations.foo3(int)Called method nullnessAnnotations.UseAnnotations.g(Object)Argument 1 might be null but must not be nullValue loaded from ?Method invoked at UseAnnotations.java:[line 25]Null value at UseAnnotations.java:[line 23]Known null at UseAnnotations.java:[line 24]clone method does not call super.clone()org.codehaus.mojo.findbugsmavenplugin.it.App.clone() does not call super.clone()At App.java:[lines 11-21]In class org.codehaus.mojo.findbugsmavenplugin.it.AppIn method org.codehaus.mojo.findbugsmavenplugin.it.App.clone()At App.java:[line 21]Clone method may return nullorg.codehaus.mojo.findbugsmavenplugin.it.App.clone() may return nullAt App.java:[lines 11-21]In class org.codehaus.mojo.findbugsmavenplugin.it.AppIn method org.codehaus.mojo.findbugsmavenplugin.it.App.clone()At App.java:[line 21]Dodgy codeBad practiceCorrectnessInternationalizationPerformanceImpossible cast
-
-<p>
-This cast will always throw a ClassCastException.
-FindBugs tracks type information from instanceof checks,
-and also uses more precise information about the types
-of values returned from methods and loaded from fields.
-Thus, it may have more precise information that just
-the declared type of a variable, and can use this to determine
-that a cast will always throw an exception at runtime.
-
-</p>
-
- Uninitialized read of field in constructor
-
- <p> This constructor reads a field which has not yet been assigned a value.
- This is often caused when the programmer mistakenly uses the field instead
- of one of the constructor's parameters.</p>
-
- Double assignment of local variable
-
-<p> This method contains a double assignment of a local variable; e.g.
-</p>
-<pre>
- public void foo() {
- int x,y;
- x = x = 17;
- }
-</pre>
-<p>Assigning the same value to a variable twice is useless, and may indicate a logic error or typo.</p>
-
- Return value of method without side effect is ignored
-
-<p>This code calls a method and ignores the return value. However our analysis shows that
-the method (including its implementations in subclasses if any) does not produce any effect
-other than return value. Thus this call can be removed.
-</p>
-<p>We are trying to reduce the false positives as much as possible, but in some cases this warning might be wrong.
-Common false-positive cases include:</p>
-<p>- The method is designed to be overridden and produce a side effect in other projects which are out of the scope of the analysis.</p>
-<p>- The method is called to trigger the class loading which may have a side effect.</p>
-<p>- The method is called just to get some exception.</p>
-<p>If you feel that our assumption is incorrect, you can use a @CheckReturnValue annotation
-to instruct FindBugs that ignoring the return value of this method is acceptable.
-</p>
-
- Null pointer dereference
-
-<p> A null pointer is dereferenced here. This will lead to a
-<code>NullPointerException</code> when the code is executed.</p>
-
- equals() used to compare array and nonarray
-
-<p>
-This method invokes the .equals(Object o) to compare an array and a reference that doesn't seem
-to be an array. If things being compared are of different types, they are guaranteed to be unequal
-and the comparison is almost certainly an error. Even if they are both arrays, the equals method
-on arrays only determines of the two arrays are the same object.
-To compare the
-contents of the arrays, use java.util.Arrays.equals(Object[], Object[]).
-</p>
-
- Useless non-empty void method
-
-<p>Our analysis shows that this non-empty void method does not actually perform any useful work.
-Please check it: probably there's a mistake in its code or its body can be fully removed.
-</p>
-<p>We are trying to reduce the false positives as much as possible, but in some cases this warning might be wrong.
-Common false-positive cases include:</p>
-<p>- The method is intended to trigger loading of some class which may have a side effect.</p>
-<p>- The method is intended to implicitly throw some obscure exception.</p>
-
- Nullcheck of value previously dereferenced
-
-<p> A value is checked here to see whether it is null, but this value can't
-be null because it was previously dereferenced and if it were null a null pointer
-exception would have occurred at the earlier dereference.
-Essentially, this code and the previous dereference
-disagree as to whether this value is allowed to be null. Either the check is redundant
-or the previous dereference is erroneous.</p>
-
- Method discards result of readLine after checking if it is non-null
-
- <p> The value returned by readLine is discarded after checking to see if the return
-value is non-null. In almost all situations, if the result is non-null, you will want
-to use that non-null value. Calling readLine again will give you a different line.</p>
-
- Unused field
-
- <p> This field is never used. Consider removing it from the class.</p>
-
- No relationship between generic parameter and method argument
-
- <p> This call to a generic collection method contains an argument
- with an incompatible class from that of the collection's parameter
- (i.e., the type of the argument is neither a supertype nor a subtype
- of the corresponding generic type argument).
- Therefore, it is unlikely that the collection contains any objects
- that are equal to the method argument used here.
- Most likely, the wrong value is being passed to the method.</p>
- <p>In general, instances of two unrelated classes are not equal.
- For example, if the <code>Foo</code> and <code>Bar</code> classes
- are not related by subtyping, then an instance of <code>Foo</code>
- should not be equal to an instance of <code>Bar</code>.
- Among other issues, doing so will likely result in an equals method
- that is not symmetrical. For example, if you define the <code>Foo</code> class
- so that a <code>Foo</code> can be equal to a <code>String</code>,
- your equals method isn't symmetrical since a <code>String</code> can only be equal
- to a <code>String</code>.
- </p>
- <p>In rare cases, people do define nonsymmetrical equals methods and still manage to make
- their code work. Although none of the APIs document or guarantee it, it is typically
- the case that if you check if a <code>Collection<String></code> contains
- a <code>Foo</code>, the equals method of argument (e.g., the equals method of the
- <code>Foo</code> class) used to perform the equality checks.
- </p>
-
- Doomed attempt to append to an object output stream
-
- <p>
- This code opens a file in append mode and then wraps the result in an object output stream.
- This won't allow you to append to an existing object output stream stored in a file. If you want to be
- able to append to an object output stream, you need to keep the object output stream open.
- </p>
- <p>The only situation in which opening a file in append mode and the writing an object output stream
- could work is if on reading the file you plan to open it in random access mode and seek to the byte offset
- where the append started.
- </p>
-
- <p>
- TODO: example.
- </p>
-
- Clone method may return null
-
- <p>
- This clone method seems to return null in some circumstances, but clone is never
- allowed to return a null value. If you are convinced this path is unreachable, throw an AssertionError
- instead.
- </p>
-
- Bad comparison of signed byte
-
-<p> Signed bytes can only have a value in the range -128 to 127. Comparing
-a signed byte with a value outside that range is vacuous and likely to be incorrect.
-To convert a signed byte <code>b</code> to an unsigned value in the range 0..255,
-use <code>0xff & b</code>
-</p>
-
- Unread field
-
- <p> This field is never read. Consider removing it from the class.</p>
-
- Useless control flow
-
-<p> This method contains a useless control flow statement, where
-control flow continues onto the same place regardless of whether or not
-the branch is taken. For example,
-this is caused by having an empty statement
-block for an <code>if</code> statement:</p>
-<pre>
- if (argv.length == 0) {
- // TODO: handle this case
- }
-</pre>
-
- equals() method does not check for null argument
-
- <p>
- This implementation of equals(Object) violates the contract defined
- by java.lang.Object.equals() because it does not check for null
- being passed as the argument. All equals() methods should return
- false if passed a null value.
- </p>
-
- Method call passes null for non-null parameter
-
- <p>
- This method call passes a null value for a non-null method parameter.
- Either the parameter is annotated as a parameter that should
- always be non-null, or analysis has shown that it will always be
- dereferenced.
- </p>
-
- Possible null pointer dereference
-
-<p> There is a branch of statement that, <em>if executed,</em> guarantees that
-a null value will be dereferenced, which
-would generate a <code>NullPointerException</code> when the code is executed.
-Of course, the problem might be that the branch or statement is infeasible and that
-the null pointer exception can't ever be executed; deciding that is beyond the ability of FindBugs.
-</p>
-
- Should be a static inner class
-
- <p> This class is an inner class, but does not use its embedded reference
- to the object which created it. This reference makes the instances
- of the class larger, and may keep the reference to the creator object
- alive longer than necessary. If possible, the class should be
- made static.
-</p>
-
- Dead store to local variable
-
-<p>
-This instruction assigns a value to a local variable,
-but the value is not read or used in any subsequent instruction.
-Often, this indicates an error, because the value computed is never
-used.
-</p>
-<p>
-Note that Sun's javac compiler often generates dead stores for
-final local variables. Because FindBugs is a bytecode-based tool,
-there is no easy way to eliminate these false positives.
-</p>
-
- Invocation of toString on an unnamed array
-
-<p>
-The code invokes toString on an (anonymous) array. Calling toString on an array generates a fairly useless result
-such as [C@16f0472. Consider using Arrays.toString to convert the array into a readable
-String that gives the contents of the array. See Programming Puzzlers, chapter 3, puzzle 12.
-</p>
-
- equals(...) used to compare incompatible arrays
-
-<p>
-This method invokes the .equals(Object o) to compare two arrays, but the arrays of
-of incompatible types (e.g., String[] and StringBuffer[], or String[] and int[]).
-They will never be equal. In addition, when equals(...) is used to compare arrays it
-only checks to see if they are the same array, and ignores the contents of the arrays.
-</p>
-
- Class defines equals() and uses Object.hashCode()
-
- <p> This class overrides <code>equals(Object)</code>, but does not
- override <code>hashCode()</code>, and inherits the implementation of
- <code>hashCode()</code> from <code>java.lang.Object</code> (which returns
- the identity hash code, an arbitrary value assigned to the object
- by the VM). Therefore, the class is very likely to violate the
- invariant that equal objects must have equal hashcodes.</p>
-
-<p>If you don't think instances of this class will ever be inserted into a HashMap/HashTable,
-the recommended <code>hashCode</code> implementation to use is:</p>
-<pre>public int hashCode() {
- assert false : "hashCode not designed";
- return 42; // any arbitrary constant will do
- }</pre>
-
- Double assignment of field
-
-<p> This method contains a double assignment of a field; e.g.
-</p>
-<pre>
- int x,y;
- public void foo() {
- x = x = 17;
- }
-</pre>
-<p>Assigning to a field twice is useless, and may indicate a logic error or typo.</p>
-
- Useless control flow to next line
-
-<p> This method contains a useless control flow statement in which control
-flow follows to the same or following line regardless of whether or not
-the branch is taken.
-Often, this is caused by inadvertently using an empty statement as the
-body of an <code>if</code> statement, e.g.:</p>
-<pre>
- if (argv.length == 1);
- System.out.println("Hello, " + argv[0]);
-</pre>
-
- Invocation of toString on an array
-
-<p>
-The code invokes toString on an array, which will generate a fairly useless result
-such as [C@16f0472. Consider using Arrays.toString to convert the array into a readable
-String that gives the contents of the array. See Programming Puzzlers, chapter 3, puzzle 12.
-</p>
-
- Code contains a hard coded reference to an absolute pathname
-
-<p>This code constructs a File object using a hard coded to an absolute pathname
-(e.g., <code>new File("/home/dannyc/workspace/j2ee/src/share/com/sun/enterprise/deployment");</code>
-</p>
-
- Method call passes null to a non-null parameter
-
- <p>
- This method passes a null value as the parameter of a method which
- must be non-null. Either this parameter has been explicitly marked
- as @Nonnull, or analysis has determined that this parameter is
- always dereferenced.
- </p>
-
- Possible null pointer dereference due to return value of called method
-
-<p> The return value from a method is dereferenced without a null check,
-and the return value of that method is one that should generally be checked
-for null. This may lead to a <code>NullPointerException</code> when the code is executed.
-</p>
-
- Reliance on default encoding
-
-<p> Found a call to a method which will perform a byte to String (or String to byte) conversion, and will assume that the default platform encoding is suitable. This will cause the application behaviour to vary between platforms. Use an alternative API and specify a charset name or Charset object explicitly. </p>
-
- Unusual equals method
-
- <p> This class doesn't do any of the patterns we recognize for checking that the type of the argument
-is compatible with the type of the <code>this</code> object. There might not be anything wrong with
-this code, but it is worth reviewing.
-</p>
-
- Static Thread.interrupted() method invoked on thread instance
-
-<p>
-This method invokes the Thread.interrupted() method on a Thread object that appears to be a Thread object that is
-not the current thread. As the interrupted() method is static, the interrupted method will be called on a different
-object than the one the author intended.
-</p>
-
- Self assignment of field
-
-<p> This method contains a self assignment of a field; e.g.
-</p>
-<pre>
- int x;
- public void foo() {
- x = x;
- }
-</pre>
-<p>Such assignments are useless, and may indicate a logic error or typo.</p>
-
- "." or "|" used for regular expression
-
-<p>
-A String function is being invoked and "." or "|" is being passed
-to a parameter that takes a regular expression as an argument. Is this what you intended?
-For example
-<li>s.replaceAll(".", "/") will return a String in which <em>every</em> character has been replaced by a '/' character
-<li>s.split(".") <em>always</em> returns a zero length array of String
-<li>"ab|cd".replaceAll("|", "/") will return "/a/b/|/c/d/"
-<li>"ab|cd".split("|") will return array with six (!) elements: [, a, b, |, c, d]
-</p>
-
- Use of class without a hashCode() method in a hashed data structure
-
- <p> A class defines an equals(Object) method but not a hashCode() method,
-and thus doesn't fulfill the requirement that equal objects have equal hashCodes.
-An instance of this class is used in a hash data structure, making the need to
-fix this problem of highest importance.
-
- Invocation of equals() on an array, which is equivalent to ==
-
-<p>
-This method invokes the .equals(Object o) method on an array. Since arrays do not override the equals
-method of Object, calling equals on an array is the same as comparing their addresses. To compare the
-contents of the arrays, use <code>java.util.Arrays.equals(Object[], Object[])</code>.
-To compare the addresses of the arrays, it would be
-less confusing to explicitly check pointer equality using <code>==</code>.
-</p>
-
- Overwritten increment
-
-<p>
-The code performs an increment operation (e.g., <code>i++</code>) and then
-immediately overwrites it. For example, <code>i = i++</code> immediately
-overwrites the incremented value with the original value.
-</p>
-
- clone method does not call super.clone()
-
-<p> This non-final class defines a clone() method that does not call super.clone().
-If this class ("<i>A</i>") is extended by a subclass ("<i>B</i>"),
-and the subclass <i>B</i> calls super.clone(), then it is likely that
-<i>B</i>'s clone() method will return an object of type <i>A</i>,
-which violates the standard contract for clone().</p>
-
-<p> If all clone() methods call super.clone(), then they are guaranteed
-to use Object.clone(), which always returns an object of the correct type.</p>
-
- Finalizer does nothing but call superclass finalizer
-
- <p> The only thing this <code>finalize()</code> method does is call
- the superclass's <code>finalize()</code> method, making it
- redundant. Delete it.</p>
-
- Class inherits equals() and uses Object.hashCode()
-
- <p> This class inherits <code>equals(Object)</code> from an abstract
- superclass, and <code>hashCode()</code> from
-<code>java.lang.Object</code> (which returns
- the identity hash code, an arbitrary value assigned to the object
- by the VM). Therefore, the class is very likely to violate the
- invariant that equal objects must have equal hashcodes.</p>
-
- <p>If you don't want to define a hashCode method, and/or don't
- believe the object will ever be put into a HashMap/Hashtable,
- define the <code>hashCode()</code> method
- to throw <code>UnsupportedOperationException</code>.</p>
-
- Self assignment of local variable
-
-<p> This method contains a self assignment of a local variable; e.g.</p>
-<pre>
- public void foo() {
- int x = 3;
- x = x;
- }
-</pre>
-<p>
-Such assignments are useless, and may indicate a logic error or typo.
-</p>
-
- Suspicious calls to generic collection methodsUninitialized read of field in constructorEqual objects must have equal hashcodesRegular expressionsComparing incompatible types for equalityInput/Output problemDead local storeNull pointer dereferenceDubious method invocationUnused fieldProblems with implementation of equals()Dubious method usedUseless codeInner class could be made staticRedundant comparison to nullBad use of return value from methodUseless control flowSuspicious integer expressionUnread fieldBad casts of object referencesUseless/non-informative string generatedSuspicious Thread InterruptedBad implementation of cloneable idiomIncorrect use of finalizersUseless self-operation
\ No newline at end of file
diff --git a/src/site/resources/examples/findbugs.html b/src/site/resources/examples/spotbugs.html
similarity index 66%
rename from src/site/resources/examples/findbugs.html
rename to src/site/resources/examples/spotbugs.html
index c5f87cf85..16fb48e58 100644
--- a/src/site/resources/examples/findbugs.html
+++ b/src/site/resources/examples/spotbugs.html
@@ -3,7 +3,7 @@
From 5d2032c562f4c5e318d755dc4e855beb5cedb6f9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 14 Mar 2020 13:56:40 -0400
Subject: [PATCH 0368/1013] [secure] Use https license everywhere instead of
http
---
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
LICENSE | 2 +-
mvnw | 2 +-
mvnw.cmd | 2 +-
src/it-tools/build-tools/pom.xml | 2 +-
src/it-tools/build-tools/verify.groovy | 2 +-
src/it-tools/prime/pom.xml | 2 +-
src/it-tools/prime/verify.groovy | 2 +-
src/it/MFINDBUGS-145/pom.xml | 2 +-
src/it/MFINDBUGS-178/pom.xml | 2 +-
src/it/basic-1/pom.xml | 2 +-
src/it/basic-1/verify.groovy | 2 +-
src/it/change-xml-filename/pom.xml | 2 +-
src/it/change-xml-filename/verify.groovy | 2 +-
src/it/check-fail/pom.xml | 2 +-
src/it/check-jvmargs/pom.xml | 2 +-
src/it/check-jvmargs/verify.groovy | 2 +-
src/it/check-multi/modules/module-1/pom.xml | 2 +-
src/it/check-multi/modules/module-2/pom.xml | 2 +-
src/it/check-multi/modules/pom.xml | 2 +-
src/it/check-multi/pom.xml | 2 +-
src/it/check-multi/verify.groovy | 2 +-
src/it/check-nofail/pom.xml | 2 +-
src/it/check-pluginList-repo/pom.xml | 2 +-
src/it/check-pluginList-repo/verify.groovy | 2 +-
src/it/check-skip/pom.xml | 2 +-
src/it/check-skip/verify.groovy | 2 +-
src/it/check-timeout/pom.xml | 2 +-
src/it/check/pom.xml | 2 +-
src/it/check/verify.groovy | 2 +-
src/it/common.xml | 2 +-
src/it/effort-default/pom.xml | 2 +-
src/it/effort-default/verify.groovy | 2 +-
src/it/effort-max/pom.xml | 2 +-
src/it/effort-max/verify.groovy | 2 +-
src/it/effort-min/pom.xml | 2 +-
src/it/effort-min/verify.groovy | 2 +-
src/it/empty/pom.xml | 2 +-
src/it/empty/verify.groovy | 2 +-
src/it/encoding-utf8/pom.xml | 2 +-
src/it/encoding-utf8/verify.groovy | 2 +-
src/it/exclude-modules/module1/pom.xml | 2 +-
src/it/exclude-modules/module2/pom.xml | 2 +-
src/it/exclude-modules/pom.xml | 2 +-
src/it/exclude-modules/verify.groovy | 2 +-
src/it/exclude-multi/pom.xml | 2 +-
src/it/exclude-multi/verify.groovy | 2 +-
src/it/exclude/pom.xml | 2 +-
src/it/exclude/verify.groovy | 2 +-
src/it/excludeBugsFile/pom.xml | 2 +-
src/it/excludeBugsFile/verify.groovy | 2 +-
src/it/experimental/pom.xml | 2 +-
src/it/experimental/verify.groovy | 2 +-
src/it/include-multi/pom.xml | 2 +-
src/it/include-multi/verify.groovy | 2 +-
src/it/include/pom.xml | 2 +-
src/it/include/verify.groovy | 2 +-
src/it/maxRank/pom.xml | 2 +-
src/it/maxRank/verify.groovy | 2 +-
src/it/multi-build/modules/module-1/pom.xml | 2 +-
src/it/multi-build/modules/module-2/pom.xml | 2 +-
src/it/multi-build/modules/pom.xml | 2 +-
src/it/multi-build/pom.xml | 2 +-
src/it/multi-build/verify.groovy | 2 +-
src/it/multi/modules/module-1/pom.xml | 2 +-
src/it/multi/modules/module-2/pom.xml | 2 +-
src/it/multi/modules/pom.xml | 2 +-
src/it/multi/pom.xml | 2 +-
src/it/multi/verify.groovy | 2 +-
src/it/nested/pom.xml | 2 +-
src/it/nested/verify.groovy | 2 +-
src/it/no-src/pom.xml | 2 +-
.../no-src/src/test/java/EmptyJUnitTest.java | 2 +-
src/it/no-src/verify.groovy | 2 +-
src/it/no-testsrc/pom.xml | 2 +-
src/it/no-testsrc/verify.groovy | 2 +-
src/it/omitVisitors/pom.xml | 2 +-
src/it/omitVisitors/verify.groovy | 2 +-
src/it/onlyAnalyze/pom.xml | 2 +-
src/it/onlyAnalyze/verify.groovy | 2 +-
src/it/pluginList-repo/pom.xml | 19 ++++++++++++++-----
src/it/pluginList-repo/verify.groovy | 2 +-
src/it/pluginList/pom.xml | 2 +-
src/it/pluginList/verify.groovy | 2 +-
src/it/relaxed/pom.xml | 2 +-
src/it/relaxed/verify.groovy | 2 +-
src/it/settings.xml | 2 +-
src/it/site-brazil/pom.xml | 2 +-
src/it/site-brazil/verify.groovy | 2 +-
src/it/site-default/pom.xml | 2 +-
src/it/site-default/verify.groovy | 2 +-
src/it/site-french/pom.xml | 2 +-
src/it/site-french/verify.groovy | 2 +-
src/it/site-spanish/pom.xml | 2 +-
src/it/site-spanish/verify.groovy | 2 +-
src/it/skip/pom.xml | 2 +-
src/it/skip/verify.groovy | 2 +-
src/it/skipEmpty/pom.xml | 2 +-
src/it/skipEmpty/verify.groovy | 2 +-
src/it/threaded/pom.xml | 2 +-
src/it/threaded/verify.groovy | 2 +-
src/it/threshold-experimental/pom.xml | 2 +-
src/it/threshold-experimental/verify.groovy | 2 +-
src/it/threshold-high/pom.xml | 2 +-
src/it/threshold-high/verify.groovy | 2 +-
src/it/threshold-low/pom.xml | 2 +-
src/it/threshold-low/verify.groovy | 2 +-
src/it/trace/pom.xml | 2 +-
src/it/trace/verify.groovy | 2 +-
src/it/userPrefs-override/pom.xml | 2 +-
src/it/userPrefs-override/verify.groovy | 2 +-
src/it/userPrefs/pom.xml | 2 +-
src/it/userPrefs/verify.groovy | 2 +-
.../mojo/spotbugs/ResourceHelper.groovy | 2 +-
.../codehaus/mojo/spotbugs/SpotBugsGui.groovy | 2 +-
.../mojo/spotbugs/SpotBugsInfo.groovy | 2 +-
.../mojo/spotbugs/SpotBugsMojo.groovy | 2 +-
.../mojo/spotbugs/SpotBugsPluginsTrait.groovy | 2 +-
.../spotbugs/SpotbugsReportGenerator.groovy | 2 +-
.../SpotbugsViolationCheckMojo.groovy | 2 +-
.../mojo/spotbugs/XDocsReporter.groovy | 2 +-
src/main/tools/jsr305.pom | 2 +-
.../apt/examples/multi-module-config.apt.vm | 2 +-
.../apt/examples/violationChecking.apt.vm | 2 +-
src/site/apt/usage.apt.vm | 2 +-
125 files changed, 138 insertions(+), 129 deletions(-)
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java
index b901097f2..e76d1f324 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/LICENSE b/LICENSE
index 6b0b1270f..c8118641c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -193,7 +193,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/mvnw b/mvnw
index 41c0f0c23..a16b5431b 100755
--- a/mvnw
+++ b/mvnw
@@ -8,7 +8,7 @@
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
-# http://www.apache.org/licenses/LICENSE-2.0
+# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
diff --git a/mvnw.cmd b/mvnw.cmd
index 86115719e..c8d43372c 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
diff --git a/src/it-tools/build-tools/pom.xml b/src/it-tools/build-tools/pom.xml
index 3666aee79..61744c134 100644
--- a/src/it-tools/build-tools/pom.xml
+++ b/src/it-tools/build-tools/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it-tools/build-tools/verify.groovy b/src/it-tools/build-tools/verify.groovy
index 8e883aa8a..f8124451f 100644
--- a/src/it-tools/build-tools/verify.groovy
+++ b/src/it-tools/build-tools/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it-tools/prime/pom.xml b/src/it-tools/prime/pom.xml
index c568e8b33..0e0f4ce4c 100644
--- a/src/it-tools/prime/pom.xml
+++ b/src/it-tools/prime/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it-tools/prime/verify.groovy b/src/it-tools/prime/verify.groovy
index 942760633..4b0cf8b2b 100644
--- a/src/it-tools/prime/verify.groovy
+++ b/src/it-tools/prime/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/MFINDBUGS-145/pom.xml b/src/it/MFINDBUGS-145/pom.xml
index de276316e..1c1ecf67f 100644
--- a/src/it/MFINDBUGS-145/pom.xml
+++ b/src/it/MFINDBUGS-145/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/MFINDBUGS-178/pom.xml b/src/it/MFINDBUGS-178/pom.xml
index aa72d33ec..14a84d571 100644
--- a/src/it/MFINDBUGS-178/pom.xml
+++ b/src/it/MFINDBUGS-178/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/basic-1/pom.xml b/src/it/basic-1/pom.xml
index 75442e864..4563503c4 100644
--- a/src/it/basic-1/pom.xml
+++ b/src/it/basic-1/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/basic-1/verify.groovy b/src/it/basic-1/verify.groovy
index 7ca6b56f1..f12cbc7ca 100644
--- a/src/it/basic-1/verify.groovy
+++ b/src/it/basic-1/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/change-xml-filename/pom.xml b/src/it/change-xml-filename/pom.xml
index eab359d33..aaa664f5f 100644
--- a/src/it/change-xml-filename/pom.xml
+++ b/src/it/change-xml-filename/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/change-xml-filename/verify.groovy b/src/it/change-xml-filename/verify.groovy
index a069a481d..84773c695 100644
--- a/src/it/change-xml-filename/verify.groovy
+++ b/src/it/change-xml-filename/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-fail/pom.xml b/src/it/check-fail/pom.xml
index dbd809e4e..0bb7616b1 100644
--- a/src/it/check-fail/pom.xml
+++ b/src/it/check-fail/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-jvmargs/pom.xml b/src/it/check-jvmargs/pom.xml
index 003f5c4f9..022195ae7 100644
--- a/src/it/check-jvmargs/pom.xml
+++ b/src/it/check-jvmargs/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-jvmargs/verify.groovy b/src/it/check-jvmargs/verify.groovy
index 932f29a2f..7ce882d90 100644
--- a/src/it/check-jvmargs/verify.groovy
+++ b/src/it/check-jvmargs/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-multi/modules/module-1/pom.xml b/src/it/check-multi/modules/module-1/pom.xml
index 2d92dcdf5..7980b0cbc 100644
--- a/src/it/check-multi/modules/module-1/pom.xml
+++ b/src/it/check-multi/modules/module-1/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-multi/modules/module-2/pom.xml b/src/it/check-multi/modules/module-2/pom.xml
index 20c80a6dd..963358fb1 100644
--- a/src/it/check-multi/modules/module-2/pom.xml
+++ b/src/it/check-multi/modules/module-2/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-multi/modules/pom.xml b/src/it/check-multi/modules/pom.xml
index 3edeafb35..bce5de65c 100644
--- a/src/it/check-multi/modules/pom.xml
+++ b/src/it/check-multi/modules/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-multi/pom.xml b/src/it/check-multi/pom.xml
index e61f3a8b0..d5f5e63fc 100644
--- a/src/it/check-multi/pom.xml
+++ b/src/it/check-multi/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-multi/verify.groovy b/src/it/check-multi/verify.groovy
index 4eaa8627a..f54885656 100644
--- a/src/it/check-multi/verify.groovy
+++ b/src/it/check-multi/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-nofail/pom.xml b/src/it/check-nofail/pom.xml
index 34c6977c6..8d4a2daa8 100644
--- a/src/it/check-nofail/pom.xml
+++ b/src/it/check-nofail/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/check-pluginList-repo/pom.xml b/src/it/check-pluginList-repo/pom.xml
index 0ccad2d2a..6ba00d915 100644
--- a/src/it/check-pluginList-repo/pom.xml
+++ b/src/it/check-pluginList-repo/pom.xml
@@ -2,7 +2,7 @@
+
4.0.0
diff --git a/src/it/pluginList-repo/verify.groovy b/src/it/pluginList-repo/verify.groovy
index 7ca6b56f1..f12cbc7ca 100644
--- a/src/it/pluginList-repo/verify.groovy
+++ b/src/it/pluginList-repo/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/pluginList/pom.xml b/src/it/pluginList/pom.xml
index 104e5c973..7b6056294 100644
--- a/src/it/pluginList/pom.xml
+++ b/src/it/pluginList/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/pluginList/verify.groovy b/src/it/pluginList/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/pluginList/verify.groovy
+++ b/src/it/pluginList/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/relaxed/pom.xml b/src/it/relaxed/pom.xml
index cf8c2c58a..f7d516a9a 100644
--- a/src/it/relaxed/pom.xml
+++ b/src/it/relaxed/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/relaxed/verify.groovy b/src/it/relaxed/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/relaxed/verify.groovy
+++ b/src/it/relaxed/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 82b87411b..58988002d 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -9,7 +9,7 @@ to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
diff --git a/src/it/site-brazil/pom.xml b/src/it/site-brazil/pom.xml
index 2599620d8..56dfb8d98 100644
--- a/src/it/site-brazil/pom.xml
+++ b/src/it/site-brazil/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-brazil/verify.groovy b/src/it/site-brazil/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/site-brazil/verify.groovy
+++ b/src/it/site-brazil/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-default/pom.xml b/src/it/site-default/pom.xml
index 064c913ae..3493d096b 100644
--- a/src/it/site-default/pom.xml
+++ b/src/it/site-default/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-default/verify.groovy b/src/it/site-default/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/site-default/verify.groovy
+++ b/src/it/site-default/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-french/pom.xml b/src/it/site-french/pom.xml
index d349bac91..df32112fa 100644
--- a/src/it/site-french/pom.xml
+++ b/src/it/site-french/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-french/verify.groovy b/src/it/site-french/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/site-french/verify.groovy
+++ b/src/it/site-french/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-spanish/pom.xml b/src/it/site-spanish/pom.xml
index 60e6ac92f..219c89b69 100644
--- a/src/it/site-spanish/pom.xml
+++ b/src/it/site-spanish/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/site-spanish/verify.groovy b/src/it/site-spanish/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/site-spanish/verify.groovy
+++ b/src/it/site-spanish/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/skip/pom.xml b/src/it/skip/pom.xml
index d07523149..e9d979a6b 100644
--- a/src/it/skip/pom.xml
+++ b/src/it/skip/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/skip/verify.groovy b/src/it/skip/verify.groovy
index fcc0985ca..c7acf5b0a 100644
--- a/src/it/skip/verify.groovy
+++ b/src/it/skip/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/skipEmpty/pom.xml b/src/it/skipEmpty/pom.xml
index 35995bc4e..2593429ed 100644
--- a/src/it/skipEmpty/pom.xml
+++ b/src/it/skipEmpty/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/skipEmpty/verify.groovy b/src/it/skipEmpty/verify.groovy
index 309f689d7..c673ae575 100644
--- a/src/it/skipEmpty/verify.groovy
+++ b/src/it/skipEmpty/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threaded/pom.xml b/src/it/threaded/pom.xml
index bf86adb82..02975af2a 100644
--- a/src/it/threaded/pom.xml
+++ b/src/it/threaded/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threaded/verify.groovy b/src/it/threaded/verify.groovy
index c327dab24..8e39c9dd7 100644
--- a/src/it/threaded/verify.groovy
+++ b/src/it/threaded/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-experimental/pom.xml b/src/it/threshold-experimental/pom.xml
index 0a8a7c5d5..aeec3f248 100644
--- a/src/it/threshold-experimental/pom.xml
+++ b/src/it/threshold-experimental/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-experimental/verify.groovy b/src/it/threshold-experimental/verify.groovy
index 6568e3282..c88eef3a1 100644
--- a/src/it/threshold-experimental/verify.groovy
+++ b/src/it/threshold-experimental/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-high/pom.xml b/src/it/threshold-high/pom.xml
index 610c25ead..09d1c1fbf 100644
--- a/src/it/threshold-high/pom.xml
+++ b/src/it/threshold-high/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-high/verify.groovy b/src/it/threshold-high/verify.groovy
index 7ca6b56f1..f12cbc7ca 100644
--- a/src/it/threshold-high/verify.groovy
+++ b/src/it/threshold-high/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-low/pom.xml b/src/it/threshold-low/pom.xml
index fa2e1a40b..aab22b527 100644
--- a/src/it/threshold-low/pom.xml
+++ b/src/it/threshold-low/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/threshold-low/verify.groovy b/src/it/threshold-low/verify.groovy
index c4788f4f3..d89e93913 100644
--- a/src/it/threshold-low/verify.groovy
+++ b/src/it/threshold-low/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/trace/pom.xml b/src/it/trace/pom.xml
index 45886744c..7e31e37dd 100644
--- a/src/it/trace/pom.xml
+++ b/src/it/trace/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/trace/verify.groovy b/src/it/trace/verify.groovy
index 7ca6b56f1..f12cbc7ca 100644
--- a/src/it/trace/verify.groovy
+++ b/src/it/trace/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/userPrefs-override/pom.xml b/src/it/userPrefs-override/pom.xml
index 80ef07eb7..008d8c645 100644
--- a/src/it/userPrefs-override/pom.xml
+++ b/src/it/userPrefs-override/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/userPrefs-override/verify.groovy b/src/it/userPrefs-override/verify.groovy
index 7b342cea3..ad9133f2b 100644
--- a/src/it/userPrefs-override/verify.groovy
+++ b/src/it/userPrefs-override/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/userPrefs/pom.xml b/src/it/userPrefs/pom.xml
index 6d4b30458..96cbce103 100644
--- a/src/it/userPrefs/pom.xml
+++ b/src/it/userPrefs/pom.xml
@@ -6,7 +6,7 @@
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/it/userPrefs/verify.groovy b/src/it/userPrefs/verify.groovy
index 6aacdc4bb..77ced0780 100644
--- a/src/it/userPrefs/verify.groovy
+++ b/src/it/userPrefs/verify.groovy
@@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
index 240f4d73e..fcedf6414 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
index 7c7720bff..4d7d43bdd 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index 5e9f27b7d..729cbec39 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 59da9df68..be0258d0b 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
index 203ff94a1..af6b0559f 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
index cb112772e..9c9e18b11 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index b84d011d7..3e6147772 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
index 3a307bf35..21b32d534 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
@@ -9,7 +9,7 @@ package org.codehaus.mojo.spotbugs
* "License") you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
diff --git a/src/main/tools/jsr305.pom b/src/main/tools/jsr305.pom
index b95ebb6bf..c28dab18c 100644
--- a/src/main/tools/jsr305.pom
+++ b/src/main/tools/jsr305.pom
@@ -12,7 +12,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txtrepo
diff --git a/src/site/apt/examples/multi-module-config.apt.vm b/src/site/apt/examples/multi-module-config.apt.vm
index 257782e26..5429816bb 100644
--- a/src/site/apt/examples/multi-module-config.apt.vm
+++ b/src/site/apt/examples/multi-module-config.apt.vm
@@ -12,7 +12,7 @@
~~ "License"); you may not use this file except in compliance
~~ with the License. You may obtain a copy of the License at
~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
+~~ https://www.apache.org/licenses/LICENSE-2.0
~~
~~ Unless required by applicable law or agreed to in writing,
~~ software distributed under the License is distributed on an
diff --git a/src/site/apt/examples/violationChecking.apt.vm b/src/site/apt/examples/violationChecking.apt.vm
index 92510481c..2924c9e3c 100644
--- a/src/site/apt/examples/violationChecking.apt.vm
+++ b/src/site/apt/examples/violationChecking.apt.vm
@@ -12,7 +12,7 @@
~~ "License"); you may not use this file except in compliance
~~ with the License. You may obtain a copy of the License at
~~
- ~~ http://www.apache.org/licenses/LICENSE-2.0
+ ~~ https://www.apache.org/licenses/LICENSE-2.0
~~
~~ Unless required by applicable law or agreed to in writing,
~~ software distributed under the License is distributed on an
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index b25884e76..52053841f 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -12,7 +12,7 @@
~~ "License"); you may not use this file except in compliance
~~ with the License. You may obtain a copy of the License at
~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
+~~ https://www.apache.org/licenses/LICENSE-2.0
~~
~~ Unless required by applicable law or agreed to in writing,
~~ software distributed under the License is distributed on an
From 932024ba8740fbedbad5e8d642a0ef09088daeb0 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 14 Mar 2020 14:10:51 -0400
Subject: [PATCH 0369/1013] [secure] More https instead of http and correct
some redirects / bad pages
---
LICENSE | 2 +-
pom.xml | 2 +-
src/it/multi/modules/module-1/src/site/site.xml | 2 +-
src/it/multi/modules/module-2/src/site/site.xml | 2 +-
.../groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy | 2 +-
.../codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy | 2 +-
src/main/tools/jFormatString.pom | 4 ++--
src/main/tools/spotbugs-annotations.pom | 2 +-
src/main/tools/spotbugs-ant.pom | 2 +-
src/main/tools/spotbugs.pom | 2 +-
src/site/apt/examples/multi-module-config.apt.vm | 2 +-
src/site/apt/examples/violationChecking.apt.vm | 2 +-
src/site/apt/usage.apt.vm | 2 +-
src/site/fml/faq.fml | 2 +-
src/site/resources/examples/spotbugs.html | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/LICENSE b/LICENSE
index c8118641c..ccd61dcfe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
Apache License
Version 2.0, January 2004
- http://www.apache.org/licenses/
+ https://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
diff --git a/pom.xml b/pom.xml
index ba6189ccb..8dba43b6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
Rolf Kulemannroku@apache.orgNEO Business Partners
- http://www.neo-partners.com
+ https://www.axians.de/de/portfolio/sap-solutions-technology/Java Developer
diff --git a/src/it/multi/modules/module-1/src/site/site.xml b/src/it/multi/modules/module-1/src/site/site.xml
index 91b1fd0a8..d588ac2de 100644
--- a/src/it/multi/modules/module-1/src/site/site.xml
+++ b/src/it/multi/modules/module-1/src/site/site.xml
@@ -3,7 +3,7 @@
-
+
${reports}
diff --git a/src/it/multi/modules/module-2/src/site/site.xml b/src/it/multi/modules/module-2/src/site/site.xml
index 91b1fd0a8..d588ac2de 100644
--- a/src/it/multi/modules/module-2/src/site/site.xml
+++ b/src/it/multi/modules/module-2/src/site/site.xml
@@ -3,7 +3,7 @@
-
+
${reports}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index 729cbec39..65f38a985 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -23,7 +23,7 @@ package org.codehaus.mojo.spotbugs
* Generates a Spotbugs Report when the site plugin is run.
* The HTML report is generated for site commands only.
* To see more documentation about Spotbugs' options, please see the
- * Spotbugs Manual.
+ * Spotbugs Manual.
*/
interface SpotBugsInfo {
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index 3e6147772..542ff8b69 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -49,7 +49,7 @@ import org.codehaus.plexus.util.FileUtils
/**
* Fail the build if there were any SpotBugs violations in the source code.
* An XML report is put out by default in the target directory with the errors.
- * To see more documentation about SpotBugs' options, please see the SpotBugs Manual..
+ * To see more documentation about SpotBugs' options, please see the SpotBugs Manual..
*
* @since 2.0
*/
diff --git a/src/main/tools/jFormatString.pom b/src/main/tools/jFormatString.pom
index 9c6deee3e..a79c24ef1 100644
--- a/src/main/tools/jFormatString.pom
+++ b/src/main/tools/jFormatString.pom
@@ -6,13 +6,13 @@
jFormatString@Spotbugs.version@jar
- http://www.github.com/spotbugs/
+ https://www.github.com/spotbugs/SpotBugs-jFormatStringjFormatString for SpotbugsGNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
+ https://www.gnu.org/licenses/lgpl.htmlrepo
diff --git a/src/main/tools/spotbugs-annotations.pom b/src/main/tools/spotbugs-annotations.pom
index 5bc9b38bb..bb0a265a6 100644
--- a/src/main/tools/spotbugs-annotations.pom
+++ b/src/main/tools/spotbugs-annotations.pom
@@ -12,7 +12,7 @@
GNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
+ https://www.gnu.org/licenses/lgpl.htmlrepo
diff --git a/src/main/tools/spotbugs-ant.pom b/src/main/tools/spotbugs-ant.pom
index 8f8257e69..99c7a1db3 100644
--- a/src/main/tools/spotbugs-ant.pom
+++ b/src/main/tools/spotbugs-ant.pom
@@ -12,7 +12,7 @@
GNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
+ https://www.gnu.org/licenses/lgpl.htmlrepo
diff --git a/src/main/tools/spotbugs.pom b/src/main/tools/spotbugs.pom
index 520970f1e..426972e8f 100644
--- a/src/main/tools/spotbugs.pom
+++ b/src/main/tools/spotbugs.pom
@@ -12,7 +12,7 @@
GNU Lesser Public License
- http://www.gnu.org/licenses/lgpl.html
+ https://www.gnu.org/licenses/lgpl.htmlrepo
diff --git a/src/site/apt/examples/multi-module-config.apt.vm b/src/site/apt/examples/multi-module-config.apt.vm
index 5429816bb..4ea959212 100644
--- a/src/site/apt/examples/multi-module-config.apt.vm
+++ b/src/site/apt/examples/multi-module-config.apt.vm
@@ -22,7 +22,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Multimodule Configuration
diff --git a/src/site/apt/examples/violationChecking.apt.vm b/src/site/apt/examples/violationChecking.apt.vm
index 2924c9e3c..5ac98fe73 100644
--- a/src/site/apt/examples/violationChecking.apt.vm
+++ b/src/site/apt/examples/violationChecking.apt.vm
@@ -22,7 +22,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Violation Checking
diff --git a/src/site/apt/usage.apt.vm b/src/site/apt/usage.apt.vm
index 52053841f..a1e34fb3e 100644
--- a/src/site/apt/usage.apt.vm
+++ b/src/site/apt/usage.apt.vm
@@ -22,7 +22,7 @@
~~ under the License.
~~ NOTE: For help with the syntax of this file, see:
-~~ http://maven.apache.org/doxia/references/apt-format.html
+~~ https://maven.apache.org/doxia/references/apt-format.html
Usage
${projectVersion}
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 5acd357d0..58dfcc924 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -12,7 +12,7 @@
This may be addressed in the future by a module like
- dashboard
+ dashboard
to get an aggregate report.
AbstractMissingHashCode$StillMissingHashCode inherits equals and uses Object.hashCode()
BAD_PRACTICE
@@ -180,13 +183,14 @@
AbstractMissingHashC
Medium
AccidentalNonConstructorInInnerClass$DoNotReport
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Should AccidentalNonConstructorInInnerClass$DoNotReport be a _static_ inner class?
PERFORMANCE
@@ -195,13 +199,14 @@
AccidentalNonCon
Medium
AccidentalNonConstructorInInnerClass$Report
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Should AccidentalNonConstructorInInnerClass$Report be a _static_ inner class?
PERFORMANCE
@@ -210,13 +215,14 @@
AccidentalNonConstruc
Medium
AppendingToAnObjectOutputStream
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Doomed attempt to append to an object output stream in AppendingToAnObjectOutputStream.appendObject1(File, Object)
CORRECTNESS
@@ -243,13 +249,14 @@
AppendingToAnObjectOutputStream<
High
ArrayToString
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Invocation of toString on an unnamed array in ArrayToString.print2()
CORRECTNESS
@@ -276,13 +283,14 @@
ArrayToString
Medium
AssumeUnsignedBytes
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Bad comparison of signed byte with 200 in AssumeUnsignedBytes.find200(byte[])
CORRECTNESS
@@ -291,13 +299,14 @@
AssumeUnsignedBytes
High
UseOfNonHashableClassInHashDataStructure
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
UseOfNonHashableClassInHashDataStructure.equals(Object) is unusual
STYLE
@@ -324,13 +333,14 @@
UseOfNonHashableClassIn
Medium
UselessAssignments
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Dead store to $L2 in new UselessAssignments(int, int)
STYLE
@@ -417,13 +427,14 @@
UselessAssignments
Medium
UselessControlFlow
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Useless control flow in UselessControlFlow.report2(Object, Object)
STYLE
@@ -450,13 +461,14 @@
UselessControlFlow
Medium
UselessCurrentThread
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
UselessCurrentThread.run() invokes static Thread.interrupted() method on thread instance
CORRECTNESS
@@ -465,13 +477,14 @@
UselessCurrentThread
Medium
UselessFinalize
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
UselessFinalize.finalize() does nothing except call super.finalize(); delete it
BAD_PRACTICE
@@ -480,13 +493,14 @@
UselessFinalize
Medium
UserMistakes
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Dead store to $L3 in UserMistakes.main(String[])
STYLE
@@ -519,13 +533,14 @@
UserMistakes
Medium
equals.ArrayEquality
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Calling String[].equals(String) in equals.ArrayEquality.reportProblemsWithArrayEquality(String[], String)
CORRECTNESS
@@ -576,13 +591,14 @@
equals.ArrayEquality
Medium
gcUnrelatedTypes.AllListsCouldBeEqual
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Impossible cast from java.util.LinkedList to java.util.ArrayList in gcUnrelatedTypes.AllListsCouldBeEqual.main(String[])
CORRECTNESS
@@ -615,13 +631,14 @@
gcUnrelatedTypes.AllListsC
Medium
gcUnrelatedTypes.ArrayListContains
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
String is incompatible with expected argument type ArrayListContains$Dummy in new gcUnrelatedTypes.ArrayListContains(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)
CORRECTNESS
@@ -690,13 +707,14 @@
gcUnrelatedTypes.ArrayListCon
Medium
gcUnrelatedTypes.ArrayListContains0
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Dead store to $L11 in new gcUnrelatedTypes.ArrayListContains0(ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList, ArrayList)
STYLE
@@ -789,13 +807,14 @@
gcUnrelatedTypes.ArrayListCo
Medium
npe.UseCheckUse
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Nullcheck of UseCheckUse.x at line 10 of value previously dereferenced in npe.UseCheckUse.f(boolean)
CORRECTNESS
@@ -804,13 +823,14 @@
npe.UseCheckUse
High
nullnessAnnotations.UseAnnotations
-
+
+
Spotbug Results
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
Bug
+
Category
+
Details
+
Line
+
Priority
Null pointer dereference of ? in nullnessAnnotations.UseAnnotations.bar2()
CORRECTNESS
@@ -861,13 +881,14 @@
nullnessAnnotations.UseAnnota
Medium
com.github.spotbugs.spotbugs-maven-plugin.it.App
-
-
-
Bug
-
Category
-
Details
-
Line
-
Priority
+
+
Spotbug Results
+
+
Bug
+
Category
+
Details
+
Line
+
Priority
com.github.spotbugs.spotbugs-maven-plugin.it.App.clone() does not call super.clone()
BAD_PRACTICE
From e0d8383088d7c90555ad4945d2b33a7fc795fc5a Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 14 Mar 2020 15:44:53 -0400
Subject: [PATCH 0373/1013] [cleanup] More formatting / html 5
---
src/site/fml/faq.fml | 2 +-
src/site/resources/examples/css/maven-theme.css | 1 -
src/site/resources/examples/css/site.css | 2 +-
src/site/resources/examples/spotbugs.xml | 2 +-
src/site/resources/examples/spotbugsXml.xml | 3 ++-
.../spotbugs/spotbugs-maven-plugin/it/package-summary.html | 3 ++-
src/site/resources/examples/xref-test/overview-summary.html | 3 ++-
.../examples/xref/badNaming/package1/package-summary.html | 3 ++-
.../examples/xref/badNaming/package2/package-summary.html | 3 ++-
src/site/resources/examples/xref/equals/package-summary.html | 3 ++-
.../examples/xref/gcUnrelatedTypes/package-summary.html | 3 ++-
src/site/resources/examples/xref/jsr305/package-summary.html | 3 ++-
src/site/resources/examples/xref/npe/package-summary.html | 3 ++-
.../examples/xref/nullnessAnnotations/package-summary.html | 3 ++-
.../resources/examples/xref/obligation/package-summary.html | 3 ++-
src/site/resources/examples/xref/overview-summary.html | 3 ++-
src/site/resources/examples/xref/package-summary.html | 3 ++-
.../resources/examples/xref/uselessThread/package-summary.html | 3 ++-
18 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 58dfcc924..250becf39 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -36,4 +36,4 @@
-
\ No newline at end of file
+
diff --git a/src/site/resources/examples/css/maven-theme.css b/src/site/resources/examples/css/maven-theme.css
index c982168bf..3725046d2 100644
--- a/src/site/resources/examples/css/maven-theme.css
+++ b/src/site/resources/examples/css/maven-theme.css
@@ -138,4 +138,3 @@ dt {
.infomark {
background-image: url(../images/icon_info_sml.gif);
}
-
diff --git a/src/site/resources/examples/css/site.css b/src/site/resources/examples/css/site.css
index 055e7e286..a7d41b2d0 100644
--- a/src/site/resources/examples/css/site.css
+++ b/src/site/resources/examples/css/site.css
@@ -1 +1 @@
-/* You can override this file with your own styles */
\ No newline at end of file
+/* You can override this file with your own styles */
diff --git a/src/site/resources/examples/spotbugs.xml b/src/site/resources/examples/spotbugs.xml
index 1e19c47f6..8a516863b 100644
--- a/src/site/resources/examples/spotbugs.xml
+++ b/src/site/resources/examples/spotbugs.xml
@@ -1,2 +1,2 @@
-/Users/garvin/gitProjects/Spotbugs/spotbugs-maven-plugin/target/it-src-spotbugs/java/Users/garvin/gitProjects/Spotbugs/spotbugs-maven-plugin/src/it-src/test/java
\ No newline at end of file
+/Users/garvin/gitProjects/Spotbugs/spotbugs-maven-plugin/target/it-src-spotbugs/java/Users/garvin/gitProjects/Spotbugs/spotbugs-maven-plugin/src/it-src/test/java
diff --git a/src/site/resources/examples/spotbugsXml.xml b/src/site/resources/examples/spotbugsXml.xml
index bf3a326fa..349a321e7 100644
--- a/src/site/resources/examples/spotbugsXml.xml
+++ b/src/site/resources/examples/spotbugsXml.xml
@@ -414,4 +414,5 @@ to use Object.clone(), which always returns an object of the correct type.</p
Such assignments are useless, and may indicate a logic error or typo.
</p>
- Suspicious calls to generic collection methodsUninitialized read of field in constructorEqual objects must have equal hashcodesRegular expressionsComparing incompatible types for equalityInput/Output problemDead local storeNull pointer dereferenceDubious method invocationUnused fieldProblems with implementation of equals()Dubious method usedUseless codeInner class could be made staticRedundant comparison to nullBad use of return value from methodUseless control flowSuspicious integer expressionUnread fieldBad casts of object referencesUseless/non-informative string generatedSuspicious Thread InterruptedBad implementation of cloneable idiomIncorrect use of finalizersUseless self-operation
\ No newline at end of file
+ Suspicious calls to generic collection methodsUninitialized read of field in constructorEqual objects must have equal hashcodesRegular expressionsComparing incompatible types for equalityInput/Output problemDead local storeNull pointer dereferenceDubious method invocationUnused fieldProblems with implementation of equals()Dubious method usedUseless codeInner class could be made staticRedundant comparison to nullBad use of return value from methodUseless control flowSuspicious integer expressionUnread fieldBad casts of object referencesUseless/non-informative string generatedSuspicious Thread InterruptedBad implementation of cloneable idiomIncorrect use of finalizersUseless self-operation
+
\ No newline at end of file
diff --git a/src/site/resources/examples/xref-test/com/github/spotbugs/spotbugs-maven-plugin/it/package-summary.html b/src/site/resources/examples/xref-test/com/github/spotbugs/spotbugs-maven-plugin/it/package-summary.html
index 1ab163d4e..5a460ab8e 100644
--- a/src/site/resources/examples/xref-test/com/github/spotbugs/spotbugs-maven-plugin/it/package-summary.html
+++ b/src/site/resources/examples/xref-test/com/github/spotbugs/spotbugs-maven-plugin/it/package-summary.html
@@ -30,9 +30,10 @@
From 3ec226c29246b242d2dbc6d9afe305e628a7c96c Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 15 Mar 2020 19:02:42 -0400
Subject: [PATCH 0374/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.0.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8dba43b6d..9750d8668 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.0-SNAPSHOT
+ 4.0.0maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.0.0GitHub Issues
From 9abfdd17617b8db2b7908215003dbf6aa9b6d70a Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 15 Mar 2020 19:02:43 -0400
Subject: [PATCH 0375/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9750d8668..c7fa4b4f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.0
+ 4.0.1-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.0.0
+ HEADGitHub Issues
From a86d870958ef44d89eff459b933c0a34a082fbef Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 15 Mar 2020 19:10:07 -0400
Subject: [PATCH 0376/1013] [pom] Add patch for depedency check to latest 5.3.1
---
pom.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pom.xml b/pom.xml
index c7fa4b4f3..15625a994 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,6 +185,9 @@
2.63.91.6
+
+
+ 5.3.1
From 00ba7287d1d638c923a5f1ea2242d9a844937a20 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 15 Mar 2020 19:25:06 -0400
Subject: [PATCH 0377/1013] [pom] Skip dependency check for system scope
Recent updates in groovy now cause this to fail.
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 15625a994..6de561b70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -490,6 +490,15 @@
spotbugs-maven-plugin${project.version}
+
+
+
+ org.owasp
+ dependency-check-maven
+
+ true
+
+
From 3ff7bd2c498d4193430ed051baf229d51fec8dbb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 08:48:28 +0000
Subject: [PATCH 0378/1013] Bump org.eclipse.jgit from 5.7.0.202003090808-r to
5.7.0.202003110725-r
Bumps org.eclipse.jgit from 5.7.0.202003090808-r to 5.7.0.202003110725-r.
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6de561b70..32db839f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
4.0.37.4.7
- 5.7.0.202003090808-r
+ 5.7.0.202003110725-r7.3.1
From 41db27d707b2fdaa9df39c1f81e31231ab881aeb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 13:24:53 +0000
Subject: [PATCH 0379/1013] Bump maven-javadoc-plugin from 3.1.1 to 3.2.0
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.1.1...maven-javadoc-plugin-3.2.0)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 32db839f0..3f0a95fd3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
1.8.13.0.03.2.1
- 3.1.1
+ 3.2.03.6.01.11.23.9.0
From 9aa9cdf25ac1448e9a7e6584cf84a123a7694538 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 19 Mar 2020 08:17:59 +0000
Subject: [PATCH 0380/1013] Bump spotbugs from 4.0.0 to 4.0.1
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.0...4.0.1)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3f0a95fd3..b0e07e6fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.0
- 4.0.0
+ 4.0.14.0.02.0.0-alpha1
From 0c368b5c7272a022160e92664ba2b50a0d74abad Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 17:01:26 -0400
Subject: [PATCH 0381/1013] [pom] Bump spotbugs to 4.0.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b0e07e6fd..165d3c24b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
5.6.04.0.1
- 4.0.0
+ 4.0.12.0.0-alpha11.10.7
From fe6ade34761fc9cf95260855bfdf2cfddaccc064 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 17:01:51 -0400
Subject: [PATCH 0382/1013] [pom] Bump junit to 5.6.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 165d3c24b..78fbb16af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
${project.version}
- 5.6.0
+ 5.6.14.0.14.0.12.0.0-alpha1
From 2ffb2b2b69f4a47a16e1c3523a910613b80a9d06 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 20:44:20 -0400
Subject: [PATCH 0383/1013] [pom] Bump dependency check to 5.3.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 78fbb16af..d14c95b83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,7 @@
1.6
- 5.3.1
+ 5.3.2
From d9a1fca8a1325a865ec8c6144bc7b91969907b31 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:41:17 +0000
Subject: [PATCH 0384/1013] Bump commons-lang3 from 3.9 to 3.10
Bumps commons-lang3 from 3.9 to 3.10.
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d14c95b83..a0493657e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
3.2.22.12.6
- 3.9
+ 3.101.6
From 8cb3f5ebe1de26f7f65d11256da3556e8098a4d8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 17:02:41 -0400
Subject: [PATCH 0385/1013] [ci] Formatting issues
---
src/it/check-pluginList-repo/pom.xml | 26 +++++++++++------
src/it/excludeBugsFile/excludeBugs1.xml | 12 ++++----
src/it/settings.xml | 2 +-
src/site/resources/examples/spotbugsXml.xml | 32 ++++++++++-----------
4 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/src/it/check-pluginList-repo/pom.xml b/src/it/check-pluginList-repo/pom.xml
index e4e1226a3..32e4cfec8 100644
--- a/src/it/check-pluginList-repo/pom.xml
+++ b/src/it/check-pluginList-repo/pom.xml
@@ -1,12 +1,22 @@
-
+
diff --git a/src/it/excludeBugsFile/excludeBugs1.xml b/src/it/excludeBugsFile/excludeBugs1.xml
index a611247db..b0d90bc69 100644
--- a/src/it/excludeBugsFile/excludeBugs1.xml
+++ b/src/it/excludeBugsFile/excludeBugs1.xml
@@ -62,16 +62,16 @@ disagree as to whether this value is allowed to be null. Either the check is red
or the previous dereference is erroneous.</p>
Method call passes null to a nonnull parameter
-
+
<p>
This method passes a null value as the parameter of a method which
must be nonnull. Either this parameter has been explicitly marked
as @Nonnull, or analysis has determined that this parameter is
always dereferenced.
</p>
-
+
No relationship between generic parameter and method argument
-
+
<p> This call to a generic collection method contains an argument
with an incompatible class from that of the collection's parameter
(i.e., the type of the argument is neither a supertype nor a subtype
@@ -95,9 +95,9 @@ or the previous dereference is erroneous.</p>
a <code>Foo</code>, the equals method of argument (e.g., the equals method of the
<code>Foo</code> class) used to perform the equality checks.
</p>
-
+
Doomed attempt to append to an object output stream
-
+
<p>
This code opens a file in append mode and then wraps the result in an object output stream.
This won't allow you to append to an existing object output stream stored in a file. If you want to be
@@ -111,7 +111,7 @@ or the previous dereference is erroneous.</p>
<p>
TODO: example.
</p>
-
+
Bad comparison of signed byte
<p> Signed bytes can only have a value in the range -128 to 127. Comparing
diff --git a/src/it/settings.xml b/src/it/settings.xml
index 58988002d..0ca9717d6 100644
--- a/src/it/settings.xml
+++ b/src/it/settings.xml
@@ -47,7 +47,7 @@ under the License.
true
-
+
diff --git a/src/site/resources/examples/spotbugsXml.xml b/src/site/resources/examples/spotbugsXml.xml
index 349a321e7..9ed269d34 100644
--- a/src/site/resources/examples/spotbugsXml.xml
+++ b/src/site/resources/examples/spotbugsXml.xml
@@ -33,7 +33,7 @@ that a cast will always throw an exception at runtime.
Return value of method without side effect is ignored
<p>This code calls a method and ignores the return value. However our analysis shows that
-the method (including its implementations in subclasses if any) does not produce any effect
+the method (including its implementations in subclasses if any) does not produce any effect
other than return value. Thus this call can be removed.
</p>
<p>We are trying to reduce the false positives as much as possible, but in some cases this warning might be wrong.
@@ -91,7 +91,7 @@ to use that non-null value. Calling readLine again will give you a different lin
<p> This field is never used. Consider removing it from the class.</p>
No relationship between generic parameter and method argument
-
+
<p> This call to a generic collection method contains an argument
with an incompatible class from that of the collection's parameter
(i.e., the type of the argument is neither a supertype nor a subtype
@@ -115,9 +115,9 @@ to use that non-null value. Calling readLine again will give you a different lin
a <code>Foo</code>, the equals method of argument (e.g., the equals method of the
<code>Foo</code> class) used to perform the equality checks.
</p>
-
+
Doomed attempt to append to an object output stream
-
+
<p>
This code opens a file in append mode and then wraps the result in an object output stream.
This won't allow you to append to an existing object output stream stored in a file. If you want to be
@@ -131,15 +131,15 @@ to use that non-null value. Calling readLine again will give you a different lin
<p>
TODO: example.
</p>
-
+
Clone method may return null
-
+
<p>
This clone method seems to return null in some circumstances, but clone is never
allowed to return a null value. If you are convinced this path is unreachable, throw an AssertionError
instead.
</p>
-
+
Bad comparison of signed byte
<p> Signed bytes can only have a value in the range -128 to 127. Comparing
@@ -166,23 +166,23 @@ block for an <code>if</code> statement:</p>
</pre>
equals() method does not check for null argument
-
+
<p>
This implementation of equals(Object) violates the contract defined
by java.lang.Object.equals() because it does not check for null
being passed as the argument. All equals() methods should return
false if passed a null value.
</p>
-
+
Method call passes null for non-null parameter
-
+
<p>
This method call passes a null value for a non-null method parameter.
Either the parameter is annotated as a parameter that should
always be non-null, or analysis has shown that it will always be
dereferenced.
</p>
-
+
Possible null pointer dereference
<p> There is a branch of statement that, <em>if executed,</em> guarantees that
@@ -287,21 +287,21 @@ String that gives the contents of the array. See Programming Puzzlers, chapter 3
</p>
Method call passes null to a non-null parameter
-
+
<p>
This method passes a null value as the parameter of a method which
must be non-null. Either this parameter has been explicitly marked
as @Nonnull, or analysis has determined that this parameter is
always dereferenced.
</p>
-
+
Possible null pointer dereference due to return value of called method
-
+
<p> The return value from a method is dereferenced without a null check,
and the return value of that method is one that should generally be checked
for null. This may lead to a <code>NullPointerException</code> when the code is executed.
</p>
-
+
Reliance on default encoding
<p> Found a call to a method which will perform a byte to String (or String to byte) conversion, and will assume that the default platform encoding is suitable. This will cause the application behaviour to vary between platforms. Use an alternative API and specify a charset name or Charset object explicitly. </p>
@@ -415,4 +415,4 @@ Such assignments are useless, and may indicate a logic error or typo.
</p>
Suspicious calls to generic collection methodsUninitialized read of field in constructorEqual objects must have equal hashcodesRegular expressionsComparing incompatible types for equalityInput/Output problemDead local storeNull pointer dereferenceDubious method invocationUnused fieldProblems with implementation of equals()Dubious method usedUseless codeInner class could be made staticRedundant comparison to nullBad use of return value from methodUseless control flowSuspicious integer expressionUnread fieldBad casts of object referencesUseless/non-informative string generatedSuspicious Thread InterruptedBad implementation of cloneable idiomIncorrect use of finalizersUseless self-operation
-
\ No newline at end of file
+
From 8e97b6859ba5574ba7d6bb5eb8533a9193901bb6 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 20:06:48 -0400
Subject: [PATCH 0386/1013] [ci] Tabs to spaces / formatting
---
.../codehaus/mojo/spotbugs/SpotBugsGui.groovy | 15 +-
.../mojo/spotbugs/SpotBugsInfo.groovy | 110 +-
.../mojo/spotbugs/SpotBugsPluginsTrait.groovy | 7 +-
.../spotbugs/SpotbugsReportGenerator.groovy | 1375 ++++++++---------
.../mojo/spotbugs/XDocsReporter.groovy | 411 ++---
5 files changed, 957 insertions(+), 961 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
index 4d7d43bdd..32962e19d 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
@@ -179,14 +179,13 @@ class SpotBugsGui extends AbstractMojo implements SpotBugsPluginsTrait {
@Parameter( property="spotbugs.maxHeap", defaultValue = "512" )
int maxHeap
- /**
- * Resource Manager.
- *
- * @since 2.0
- */
- @Component(role = ResourceManager.class)
- ResourceManager resourceManager
-
+ /**
+ * Resource Manager.
+ *
+ * @since 2.0
+ */
+ @Component(role = ResourceManager.class)
+ ResourceManager resourceManager
void execute() {
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index 65f38a985..d66a7fdc8 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -27,77 +27,77 @@ package org.codehaus.mojo.spotbugs
*/
interface SpotBugsInfo {
- /**
- * The name of the Plug-In.
- *
- */
- static final String PLUGIN_NAME = "spotbugs"
+ /**
+ * The name of the Plug-In.
+ *
+ */
+ static final String PLUGIN_NAME = "spotbugs"
- /**
- * The name of the property resource bundle (Filesystem).
- *
- */
- static final String BUNDLE_NAME = "spotbugs"
+ /**
+ * The name of the property resource bundle (Filesystem).
+ *
+ */
+ static final String BUNDLE_NAME = "spotbugs"
- /**
- * The key to get the name of the Plug-In from the bundle.
- *
- */
- static final String NAME_KEY = "report.spotbugs.name"
+ /**
+ * The key to get the name of the Plug-In from the bundle.
+ *
+ */
+ static final String NAME_KEY = "report.spotbugs.name"
- /**
- * The key to get the description of the Plug-In from the bundle.
- *
- */
- static final String DESCRIPTION_KEY = "report.spotbugs.description"
+ /**
+ * The key to get the description of the Plug-In from the bundle.
+ *
+ */
+ static final String DESCRIPTION_KEY = "report.spotbugs.description"
- /**
- * The key to get the source directory message of the Plug-In from the bundle.
- *
- */
- static final String SOURCE_ROOT_KEY = "report.spotbugs.sourceRoot"
+ /**
+ * The key to get the source directory message of the Plug-In from the bundle.
+ *
+ */
+ static final String SOURCE_ROOT_KEY = "report.spotbugs.sourceRoot"
- /**
- * The key to get the source directory message of the Plug-In from the bundle.
- *
- */
- static final String TEST_SOURCE_ROOT_KEY = "report.spotbugs.testSourceRoot"
+ /**
+ * The key to get the source directory message of the Plug-In from the bundle.
+ *
+ */
+ static final String TEST_SOURCE_ROOT_KEY = "report.spotbugs.testSourceRoot"
- /**
- * The key to get the java source message of the Plug-In from the bundle.
- *
- */
- static final String JAVA_SOURCES_KEY = "report.spotbugs.javasources"
+ /**
+ * The key to get the java source message of the Plug-In from the bundle.
+ *
+ */
+ static final String JAVA_SOURCES_KEY = "report.spotbugs.javasources"
- /**
- * The regex pattern to search for java class files.
- *
- */
- static final String JAVA_REGEX_PATTERN = "**/*.class"
+ /**
+ * The regex pattern to search for java class files.
+ *
+ */
+ static final String JAVA_REGEX_PATTERN = "**/*.class"
- static final String COMMA = ","
+ static final String COMMA = ","
- static final String FORWARD_SLASH = '/'
+ static final String FORWARD_SLASH = '/'
- /**
- * The character to separate URL tokens.
- *
- */
- static final String URL_SEPARATOR = "/"
+ /**
+ * The character to separate URL tokens.
+ *
+ */
+ static final String URL_SEPARATOR = "/"
- static final String BLANK = " "
+ static final String BLANK = " "
- static final String PERIOD = "."
+ static final String PERIOD = "."
- static final EOL = "\n"
+ static final EOL = "\n"
- public static final String URL = "url"
+ public static final String URL = "url"
- static final String CLASS_SUFFIX = '.class'
+ static final String CLASS_SUFFIX = '.class'
- def spotbugsEfforts = [Max: "max", Min: "min", Default: "default"]
+ def spotbugsEfforts = [Max: "max", Min: "min", Default: "default"]
- def spotbugsThresholds = [High: "high", Exp: "experimental", Low: "low", Medium: "medium", Default: "medium"]
+ def spotbugsThresholds = [High: "high", Exp: "experimental", Low: "low", Medium: "medium", Default: "medium"]
- def spotbugsPriority = ["unknown", "High", "Medium", "Low"]
+ def spotbugsPriority = ["unknown", "High", "Medium", "Low"]
}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
index af6b0559f..0c7c95eb7 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
@@ -35,7 +35,6 @@ import org.codehaus.plexus.resource.ResourceManager
/**
* SpotBugs plugin support for Mojos.
*/
-
trait SpotBugsPluginsTrait {
// the trait needs certain objects to work, this need is expressed as abstract getters
@@ -45,8 +44,8 @@ trait SpotBugsPluginsTrait {
abstract List getRemoteRepositories()
abstract ArtifactRepository getLocalRepository()
abstract File getSpotbugsXmlOutputDirectory()
- abstract Log getLog()
- abstract ResourceManager getResourceManager()
+ abstract Log getLog()
+ abstract ResourceManager getResourceManager()
// properties in traits should be supported but don't compile currently:
// https://issues.apache.org/jira/browse/GROOVY-7536
@@ -113,7 +112,6 @@ trait SpotBugsPluginsTrait {
}
}
-
log.debug(" Plugin list is: ${urlPlugins}")
return urlPlugins
@@ -146,5 +144,4 @@ trait SpotBugsPluginsTrait {
return "-effort:" + effortParameter
}
-
}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
index 9c9e18b11..0b8aaf635 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
@@ -33,732 +33,731 @@ import org.codehaus.plexus.util.PathTool
*/
class SpotbugsReportGenerator implements SpotBugsInfo {
- /**
- * The key to get the value if the line number is not available.
- *
- */
- static final String NOLINE_KEY = "report.spotbugs.noline"
-
- /**
- * The key to get the column title for the line.
- *
- */
- static final String COLUMN_LINE_KEY = "report.spotbugs.column.line"
-
- /**
- * The key to get the column title for the bug.
- *
- */
- static final String COLUMN_BUG_KEY = "report.spotbugs.column.bug"
-
- /**
- * The key to get the column title for the bugs.
- *
- */
- static final String COLUMN_BUGS_KEY = "report.spotbugs.column.bugs"
-
- /**
- * The key to get the column title for the category.
- *
- */
- static final String COLUMN_CATEGORY_KEY = "report.spotbugs.column.category"
-
- /**
- * The key to get the column title for the priority.
- *
- */
- static final String COLUMN_PRIORITY_KEY = "report.spotbugs.column.priority"
-
- /**
- * The key to get the column title for the details.
- *
- */
- static final String COLUMN_DETAILS_KEY = "report.spotbugs.column.details"
-
- /**
- * The key to get the report title of the Plug-In from the bundle.
- *
- */
- static final String REPORT_TITLE_KEY = "report.spotbugs.reporttitle"
-
- /**
- * The key to get the report link title of the Plug-In from the bundle.
- *
- */
- static final String LINKTITLE_KEY = "report.spotbugs.linktitle"
-
- /**
- * The key to get the report link of the Plug-In from the bundle.
- *
- */
- static final String LINK_KEY = "report.spotbugs.link"
-
- /**
- * The key to get the files title of the Plug-In from the bundle.
- *
- */
- static final String FILES_KEY = "report.spotbugs.files"
-
- /**
- * The key to get the threshold of the report from the bundle.
- *
- */
- static final String THRESHOLD_KEY = "report.spotbugs.threshold"
-
- /**
- * The key to get the effort of the report from the bundle.
- *
- */
- static final String EFFORT_KEY = "report.spotbugs.effort"
-
- /**
- * The key to get the link to SpotBugs description page from the bundle.
- *
- */
- static final String DETAILSLINK_KEY = "report.spotbugs.detailslink"
-
- /**
- * The key to get the version title for SpotBugs from the bundle.
- *
- */
- static final String VERSIONTITLE_KEY = "report.spotbugs.versiontitle"
-
- /**
- * The key to get the files title of the Plug-In from the bundle.
- *
- */
- static final String SUMMARY_KEY = "report.spotbugs.summary"
-
- /**
- * The key to column title for the Class.
- *
- */
- static final String COLUMN_CLASS_KEY = "report.spotbugs.column.class"
-
- /**
- * The key to column title for the Classes.
- *
- */
- static final String COLUMN_CLASSES_KEY = "report.spotbugs.column.classes"
-
- /**
- * The key to column title for the errors.
- *
- */
- static final String COLUMN_ERRORS_KEY = "report.spotbugs.column.errors"
-
- /**
- * The key to column title for the files.
- *
- */
- static final String COLUMN_FILES_KEY = "report.spotbugs.column.files"
-
- /**
- * The key to column title for the files.
- *
- */
- static final String COLUMN_MISSINGCLASSES_KEY = "report.spotbugs.column.missingclasses"
-
- /**
- * The sink to write the report to.
- *
- */
- Sink sink
-
- /**
- * The bundle to get the messages from.
- *
- */
- ResourceBundle bundle
-
- /**
- * The logger to write logs to.
- *
- */
- Log log
-
- /**
- * The threshold of bugs severity.
- *
- */
- String threshold
-
- /**
- * The used effort for searching bugs.
- *
- */
- String effort
-
- /**
- * The name of the current class which is analysed by SpotBugs.
- *
- */
- String currentClassName
-
- /**
- * Signals if the report for the current class is opened.
- *
- */
- boolean mIsCurrentClassReportOpened = false
-
- /**
- * Signals if the jxr report plugin is enabled.
- *
- */
- boolean isJXRReportEnabled = false
-
- /**
- * The running total of bugs reported.
- *
- */
- int bugCount
-
- /**
- * The running total of missing classes reported.
- *
- */
- int missingClassCount
-
- /**
- * The running total of files analyzed.
- *
- */
- int fileCount
-
- /**
- * The Set of missing classes names reported.
- *
- */
- Set missingClassSet = new HashSet()
-
- /**
- * The running total of errors reported.
- *
- */
- int errorCount
-
- /**
- * Location where generated html will be created.
- *
- */
- File outputDirectory
-
- /**
- * Location of the Xrefs to link to.
- *
- */
- File xrefLocation
-
- /**
- * Location of the Test Xrefs to link to.
- *
- */
- File xrefTestLocation
-
- /**
- * The directories containing the sources to be compiled.
- *
- */
- List compileSourceRoots
-
- /**
- * The directories containing the test-sources to be compiled.
- *
- */
- List testSourceRoots
-
- /**
- * Run Spotbugs on the tests.
- *
- */
- boolean includeTests
-
- /**
- * "org.apache.maven.doxia.tools.SiteTool"
- *
- */
- SiteTool siteTool
-
- File basedir
-
- GPathResult spotbugsResults
-
- List bugClasses
-
- /**
- * Default constructor.
- *
- * @param sink
- * The sink to generate the report.
- * @param bundle
- * The resource bundle to get the messages from.
- * @param basedir
- * The project base directory.
- * @param siteTool
- * Doxia SiteTool Handle.
- */
- SpotbugsReportGenerator(Sink sink, ResourceBundle bundle, File basedir, SiteTool siteTool) {
-
- assert sink
- assert bundle
- assert basedir
- assert siteTool
-
- this.sink = sink
- this.bundle = bundle
- this.basedir = basedir
- this.siteTool = siteTool
-
- this.bugClasses = []
-
- this.currentClassName = ""
-
- this.bugCount = 0
- this.missingClassCount = 0
- this.errorCount = 0
- this.fileCount = 0
- }
-
-
- /**
- * @see edu.umd.cs.findbugs.BugReporter#finish()
- */
- void printBody() {
- log.debug("Finished searching for bugs!...")
- log.debug("sink is " + sink)
-
- bugClasses.each() {bugClass ->
- log.debug("finish bugClass is ${bugClass}")
-
- printBug(bugClass)
- }
-
- // close the report, write it
- sink.body_()
-
- }
-
- /**
- * Prints the top header sections of the report.
- */
- private void doHeading() {
- sink.head()
- sink.title()
- sink.text(getReportTitle())
- sink.title_()
- sink.head_()
-
- sink.body()
-
- // the title of the report
- sink.section1()
- sink.sectionTitle1()
- sink.text(getReportTitle())
- sink.sectionTitle1_()
-
- // information about SpotBugs
- sink.paragraph()
- sink.text(bundle.getString(LINKTITLE_KEY) + SpotBugsInfo.BLANK)
- sink.link(bundle.getString(LINK_KEY))
- sink.text(bundle.getString(SpotBugsInfo.NAME_KEY))
- sink.link_()
- sink.paragraph_()
-
- sink.paragraph()
- sink.text(bundle.getString(VERSIONTITLE_KEY) + SpotBugsInfo.BLANK)
- sink.italic()
- sink.text(edu.umd.cs.findbugs.Version.VERSION_STRING)
- sink.italic_()
- sink.paragraph_()
-
- sink.paragraph()
- sink.text(bundle.getString(THRESHOLD_KEY) + SpotBugsInfo.BLANK)
- sink.italic()
- sink.text(SpotBugsInfo.spotbugsThresholds.get(threshold))
- sink.italic_()
- sink.paragraph_()
-
- sink.paragraph()
- sink.text(bundle.getString(EFFORT_KEY) + SpotBugsInfo.BLANK)
- sink.italic()
- sink.text(SpotBugsInfo.spotbugsEfforts.get(effort))
- sink.italic_()
- sink.paragraph_()
- sink.section1_()
-
- }
-
- /**
- * Print the bug collection to a line in the table
- *
- * @param bugInstance
- * the bug to print
- */
- protected void printBug(String bugClass) {
-
- log.debug("printBug bugClass is ${bugClass}")
-
- openClassReportSection(bugClass)
-
- log.debug("printBug spotbugsResults is ${spotbugsResults}")
-
- spotbugsResults.BugInstance.each() {bugInstance ->
-
-
- log.debug("bugInstance ---> ${bugInstance}")
-
- if ( bugInstance.Class[0].@classname.text() == bugClass ) {
-
- def type = bugInstance.@type.text()
- def category = bugInstance.@category.text()
- def message = bugInstance.LongMessage.text()
- def priority = bugInstance.@priority.text()
- def line = bugInstance.SourceLine[0]
- log.debug("BugInstance message is ${message}")
-
- sink.tableRow()
-
- // bug
- sink.tableCell()
- sink.text(message)
- sink.tableCell_()
-
- // category
- sink.tableCell()
- sink.text(category)
- sink.tableCell_()
-
- // description link
- sink.tableCell()
- sink.link(bundle.getString(DETAILSLINK_KEY) + "#" + type)
- sink.text(type)
- sink.link_()
- sink.tableCell_()
-
- // line
- sink.tableCell()
-
- if ( isJXRReportEnabled ) {
- log.debug("isJXRReportEnabled is enabled")
- sink.rawText(assembleJxrHyperlink(line))
- } else {
- sink.text(line.@start.text())
- }
-
- sink.tableCell_()
-
- // priority
- sink.tableCell()
- sink.text(spotbugsPriority[priority.toInteger()])
- sink.tableCell_()
-
- sink.tableRow_()
- }
- }
-
- sink.table_()
-
- sink.section2_()
-
- }
-
- /**
- * Assembles the hyperlink to point to the source code.
- *
- * @param line
- * The line number object with the bug.
- * @param lineNumber
- * The line number to show in the hyperlink.
- * @return The hyperlink which points to the code.
- *
- */
- protected String assembleJxrHyperlink(GPathResult line) {
- String hyperlink
- String prefix
-
- log.debug("Inside assembleJxrHyperlink")
- log.debug("line is " + line.text())
- log.debug("outputDirectory is " + outputDirectory.getAbsolutePath())
- log.debug("xrefLocation is " + xrefLocation.getAbsolutePath())
- log.debug("xrefTestLocation is " + xrefTestLocation.getAbsolutePath())
-
- compileSourceRoots.each {compileSourceRoot ->
- if ( new File(compileSourceRoot + File.separator + line.@sourcepath.text()).exists() ) {
- prefix = PathTool.getRelativePath(outputDirectory.getAbsolutePath(), xrefLocation.getAbsolutePath())
-
- prefix = prefix ? prefix + SpotBugsInfo.URL_SEPARATOR + xrefLocation.getName() + SpotBugsInfo.URL_SEPARATOR : SpotBugsInfo.PERIOD
- return
- }
- }
-
- if ( includeTests && !prefix ) {
- testSourceRoots.each {testSourceRoot ->
- if ( new File(testSourceRoot + File.separator + line.@sourcepath.text()).exists() ) {
- prefix = PathTool.getRelativePath(outputDirectory.getAbsolutePath(), xrefTestLocation.getAbsolutePath())
-
- prefix = prefix ? prefix + SpotBugsInfo.URL_SEPARATOR + xrefTestLocation.getName() + SpotBugsInfo.URL_SEPARATOR : SpotBugsInfo.PERIOD
- return
- }
- }
- }
-
- def path = prefix + line.@classname.text().replaceAll("[.]", "/").replaceAll("[\$].*", "")
- String lineNumber = valueForLine(line)
-
- if ( lineNumber != bundle.getString(NOLINE_KEY) ) {
- hyperlink = "" + lineNumber + ""
- } else {
- hyperlink = lineNumber
- }
-
- return hyperlink
- }
-
- /**
- * Gets the report title.
- *
- * @return The report title.
- *
- */
- protected String getReportTitle() {
- return bundle.getString(REPORT_TITLE_KEY)
- }
-
- /**
- * Initialized a bug report section in the report for a particular class.
- */
- protected void openClassReportSection(String bugClass) {
- String columnBugText = bundle.getString(COLUMN_BUG_KEY)
- String columnBugCategory = bundle.getString(COLUMN_CATEGORY_KEY)
- String columnDescriptionLink = bundle.getString(COLUMN_DETAILS_KEY)
- String columnLineText = bundle.getString(COLUMN_LINE_KEY)
- String priorityText = bundle.getString(COLUMN_PRIORITY_KEY)
-
- log.debug("openClassReportSection bugClass is ${bugClass}")
-
- log.debug("Opening Class Report Section")
-
- sink.anchor(bugClass)
- sink.anchor_()
-
- sink.section2()
- sink.sectionTitle2()
- sink.text(bugClass)
- sink.sectionTitle2_()
- sink.table()
- sink.tableRow()
-
- // bug
- sink.tableHeaderCell()
- sink.text(columnBugText)
- sink.tableHeaderCell_()
-
- // category
- sink.tableHeaderCell()
- sink.text(columnBugCategory)
- sink.tableHeaderCell_()
-
- // description link
- sink.tableHeaderCell()
- sink.text(columnDescriptionLink)
- sink.tableHeaderCell_()
-
- // line
- sink.tableHeaderCell()
- sink.text(columnLineText)
- sink.tableHeaderCell_()
-
- // priority
- sink.tableHeaderCell()
- sink.text(priorityText)
- sink.tableHeaderCell_()
-
- sink.tableRow_()
- }
-
- /**
- * Print the Summary Section.
- */
- protected void printSummary() {
-
- log.debug("Entering printSummary")
-
- sink.section1()
-
- // the summary section
- sink.sectionTitle1()
- sink.text(bundle.getString(SUMMARY_KEY))
- sink.sectionTitle1_()
-
- sink.table()
- sink.tableRow()
-
- // classes
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_CLASSES_KEY))
- sink.tableHeaderCell_()
-
- // bugs
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_BUGS_KEY))
- sink.tableHeaderCell_()
-
- // Errors
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_ERRORS_KEY))
- sink.tableHeaderCell_()
-
- // Missing Classes
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_MISSINGCLASSES_KEY))
- sink.tableHeaderCell_()
+ /**
+ * The key to get the value if the line number is not available.
+ *
+ */
+ static final String NOLINE_KEY = "report.spotbugs.noline"
+
+ /**
+ * The key to get the column title for the line.
+ *
+ */
+ static final String COLUMN_LINE_KEY = "report.spotbugs.column.line"
+
+ /**
+ * The key to get the column title for the bug.
+ *
+ */
+ static final String COLUMN_BUG_KEY = "report.spotbugs.column.bug"
+
+ /**
+ * The key to get the column title for the bugs.
+ *
+ */
+ static final String COLUMN_BUGS_KEY = "report.spotbugs.column.bugs"
+
+ /**
+ * The key to get the column title for the category.
+ *
+ */
+ static final String COLUMN_CATEGORY_KEY = "report.spotbugs.column.category"
+
+ /**
+ * The key to get the column title for the priority.
+ *
+ */
+ static final String COLUMN_PRIORITY_KEY = "report.spotbugs.column.priority"
+
+ /**
+ * The key to get the column title for the details.
+ *
+ */
+ static final String COLUMN_DETAILS_KEY = "report.spotbugs.column.details"
+
+ /**
+ * The key to get the report title of the Plug-In from the bundle.
+ *
+ */
+ static final String REPORT_TITLE_KEY = "report.spotbugs.reporttitle"
+
+ /**
+ * The key to get the report link title of the Plug-In from the bundle.
+ *
+ */
+ static final String LINKTITLE_KEY = "report.spotbugs.linktitle"
+
+ /**
+ * The key to get the report link of the Plug-In from the bundle.
+ *
+ */
+ static final String LINK_KEY = "report.spotbugs.link"
+
+ /**
+ * The key to get the files title of the Plug-In from the bundle.
+ *
+ */
+ static final String FILES_KEY = "report.spotbugs.files"
+
+ /**
+ * The key to get the threshold of the report from the bundle.
+ *
+ */
+ static final String THRESHOLD_KEY = "report.spotbugs.threshold"
+
+ /**
+ * The key to get the effort of the report from the bundle.
+ *
+ */
+ static final String EFFORT_KEY = "report.spotbugs.effort"
+
+ /**
+ * The key to get the link to SpotBugs description page from the bundle.
+ *
+ */
+ static final String DETAILSLINK_KEY = "report.spotbugs.detailslink"
+
+ /**
+ * The key to get the version title for SpotBugs from the bundle.
+ *
+ */
+ static final String VERSIONTITLE_KEY = "report.spotbugs.versiontitle"
+
+ /**
+ * The key to get the files title of the Plug-In from the bundle.
+ *
+ */
+ static final String SUMMARY_KEY = "report.spotbugs.summary"
+
+ /**
+ * The key to column title for the Class.
+ *
+ */
+ static final String COLUMN_CLASS_KEY = "report.spotbugs.column.class"
+
+ /**
+ * The key to column title for the Classes.
+ *
+ */
+ static final String COLUMN_CLASSES_KEY = "report.spotbugs.column.classes"
+
+ /**
+ * The key to column title for the errors.
+ *
+ */
+ static final String COLUMN_ERRORS_KEY = "report.spotbugs.column.errors"
+
+ /**
+ * The key to column title for the files.
+ *
+ */
+ static final String COLUMN_FILES_KEY = "report.spotbugs.column.files"
+
+ /**
+ * The key to column title for the files.
+ *
+ */
+ static final String COLUMN_MISSINGCLASSES_KEY = "report.spotbugs.column.missingclasses"
+
+ /**
+ * The sink to write the report to.
+ *
+ */
+ Sink sink
+
+ /**
+ * The bundle to get the messages from.
+ *
+ */
+ ResourceBundle bundle
+
+ /**
+ * The logger to write logs to.
+ *
+ */
+ Log log
+
+ /**
+ * The threshold of bugs severity.
+ *
+ */
+ String threshold
+
+ /**
+ * The used effort for searching bugs.
+ *
+ */
+ String effort
+
+ /**
+ * The name of the current class which is analysed by SpotBugs.
+ *
+ */
+ String currentClassName
+
+ /**
+ * Signals if the report for the current class is opened.
+ *
+ */
+ boolean mIsCurrentClassReportOpened = false
+
+ /**
+ * Signals if the jxr report plugin is enabled.
+ *
+ */
+ boolean isJXRReportEnabled = false
+
+ /**
+ * The running total of bugs reported.
+ *
+ */
+ int bugCount
+
+ /**
+ * The running total of missing classes reported.
+ *
+ */
+ int missingClassCount
+
+ /**
+ * The running total of files analyzed.
+ *
+ */
+ int fileCount
+
+ /**
+ * The Set of missing classes names reported.
+ *
+ */
+ Set missingClassSet = new HashSet()
+
+ /**
+ * The running total of errors reported.
+ *
+ */
+ int errorCount
+
+ /**
+ * Location where generated html will be created.
+ *
+ */
+ File outputDirectory
+
+ /**
+ * Location of the Xrefs to link to.
+ *
+ */
+ File xrefLocation
+
+ /**
+ * Location of the Test Xrefs to link to.
+ *
+ */
+ File xrefTestLocation
+
+ /**
+ * The directories containing the sources to be compiled.
+ *
+ */
+ List compileSourceRoots
+
+ /**
+ * The directories containing the test-sources to be compiled.
+ *
+ */
+ List testSourceRoots
+
+ /**
+ * Run Spotbugs on the tests.
+ *
+ */
+ boolean includeTests
+
+ /**
+ * "org.apache.maven.doxia.tools.SiteTool"
+ *
+ */
+ SiteTool siteTool
+
+ File basedir
+
+ GPathResult spotbugsResults
+
+ List bugClasses
+
+ /**
+ * Default constructor.
+ *
+ * @param sink
+ * The sink to generate the report.
+ * @param bundle
+ * The resource bundle to get the messages from.
+ * @param basedir
+ * The project base directory.
+ * @param siteTool
+ * Doxia SiteTool Handle.
+ */
+ SpotbugsReportGenerator(Sink sink, ResourceBundle bundle, File basedir, SiteTool siteTool) {
+
+ assert sink
+ assert bundle
+ assert basedir
+ assert siteTool
+
+ this.sink = sink
+ this.bundle = bundle
+ this.basedir = basedir
+ this.siteTool = siteTool
+
+ this.bugClasses = []
+
+ this.currentClassName = ""
+
+ this.bugCount = 0
+ this.missingClassCount = 0
+ this.errorCount = 0
+ this.fileCount = 0
+ }
+
+ /**
+ * @see edu.umd.cs.findbugs.BugReporter#finish()
+ */
+ void printBody() {
+ log.debug("Finished searching for bugs!...")
+ log.debug("sink is " + sink)
+
+ bugClasses.each() {bugClass ->
+ log.debug("finish bugClass is ${bugClass}")
+
+ printBug(bugClass)
+ }
+
+ // close the report, write it
+ sink.body_()
+
+ }
+
+ /**
+ * Prints the top header sections of the report.
+ */
+ private void doHeading() {
+ sink.head()
+ sink.title()
+ sink.text(getReportTitle())
+ sink.title_()
+ sink.head_()
+
+ sink.body()
+
+ // the title of the report
+ sink.section1()
+ sink.sectionTitle1()
+ sink.text(getReportTitle())
+ sink.sectionTitle1_()
+
+ // information about SpotBugs
+ sink.paragraph()
+ sink.text(bundle.getString(LINKTITLE_KEY) + SpotBugsInfo.BLANK)
+ sink.link(bundle.getString(LINK_KEY))
+ sink.text(bundle.getString(SpotBugsInfo.NAME_KEY))
+ sink.link_()
+ sink.paragraph_()
+
+ sink.paragraph()
+ sink.text(bundle.getString(VERSIONTITLE_KEY) + SpotBugsInfo.BLANK)
+ sink.italic()
+ sink.text(edu.umd.cs.findbugs.Version.VERSION_STRING)
+ sink.italic_()
+ sink.paragraph_()
+
+ sink.paragraph()
+ sink.text(bundle.getString(THRESHOLD_KEY) + SpotBugsInfo.BLANK)
+ sink.italic()
+ sink.text(SpotBugsInfo.spotbugsThresholds.get(threshold))
+ sink.italic_()
+ sink.paragraph_()
+
+ sink.paragraph()
+ sink.text(bundle.getString(EFFORT_KEY) + SpotBugsInfo.BLANK)
+ sink.italic()
+ sink.text(SpotBugsInfo.spotbugsEfforts.get(effort))
+ sink.italic_()
+ sink.paragraph_()
+ sink.section1_()
+
+ }
+
+ /**
+ * Print the bug collection to a line in the table
+ *
+ * @param bugInstance
+ * the bug to print
+ */
+ protected void printBug(String bugClass) {
+
+ log.debug("printBug bugClass is ${bugClass}")
+
+ openClassReportSection(bugClass)
+
+ log.debug("printBug spotbugsResults is ${spotbugsResults}")
+
+ spotbugsResults.BugInstance.each() {bugInstance ->
+
+
+ log.debug("bugInstance ---> ${bugInstance}")
+
+ if ( bugInstance.Class[0].@classname.text() == bugClass ) {
+
+ def type = bugInstance.@type.text()
+ def category = bugInstance.@category.text()
+ def message = bugInstance.LongMessage.text()
+ def priority = bugInstance.@priority.text()
+ def line = bugInstance.SourceLine[0]
+ log.debug("BugInstance message is ${message}")
+
+ sink.tableRow()
+
+ // bug
+ sink.tableCell()
+ sink.text(message)
+ sink.tableCell_()
+
+ // category
+ sink.tableCell()
+ sink.text(category)
+ sink.tableCell_()
+
+ // description link
+ sink.tableCell()
+ sink.link(bundle.getString(DETAILSLINK_KEY) + "#" + type)
+ sink.text(type)
+ sink.link_()
+ sink.tableCell_()
+
+ // line
+ sink.tableCell()
+
+ if ( isJXRReportEnabled ) {
+ log.debug("isJXRReportEnabled is enabled")
+ sink.rawText(assembleJxrHyperlink(line))
+ } else {
+ sink.text(line.@start.text())
+ }
+
+ sink.tableCell_()
+
+ // priority
+ sink.tableCell()
+ sink.text(spotbugsPriority[priority.toInteger()])
+ sink.tableCell_()
+
+ sink.tableRow_()
+ }
+ }
+
+ sink.table_()
+
+ sink.section2_()
+
+ }
+
+ /**
+ * Assembles the hyperlink to point to the source code.
+ *
+ * @param line
+ * The line number object with the bug.
+ * @param lineNumber
+ * The line number to show in the hyperlink.
+ * @return The hyperlink which points to the code.
+ *
+ */
+ protected String assembleJxrHyperlink(GPathResult line) {
+ String hyperlink
+ String prefix
+
+ log.debug("Inside assembleJxrHyperlink")
+ log.debug("line is " + line.text())
+ log.debug("outputDirectory is " + outputDirectory.getAbsolutePath())
+ log.debug("xrefLocation is " + xrefLocation.getAbsolutePath())
+ log.debug("xrefTestLocation is " + xrefTestLocation.getAbsolutePath())
+
+ compileSourceRoots.each {compileSourceRoot ->
+ if ( new File(compileSourceRoot + File.separator + line.@sourcepath.text()).exists() ) {
+ prefix = PathTool.getRelativePath(outputDirectory.getAbsolutePath(), xrefLocation.getAbsolutePath())
+
+ prefix = prefix ? prefix + SpotBugsInfo.URL_SEPARATOR + xrefLocation.getName() + SpotBugsInfo.URL_SEPARATOR : SpotBugsInfo.PERIOD
+ return
+ }
+ }
+
+ if ( includeTests && !prefix ) {
+ testSourceRoots.each {testSourceRoot ->
+ if ( new File(testSourceRoot + File.separator + line.@sourcepath.text()).exists() ) {
+ prefix = PathTool.getRelativePath(outputDirectory.getAbsolutePath(), xrefTestLocation.getAbsolutePath())
+
+ prefix = prefix ? prefix + SpotBugsInfo.URL_SEPARATOR + xrefTestLocation.getName() + SpotBugsInfo.URL_SEPARATOR : SpotBugsInfo.PERIOD
+ return
+ }
+ }
+ }
+
+ def path = prefix + line.@classname.text().replaceAll("[.]", "/").replaceAll("[\$].*", "")
+ String lineNumber = valueForLine(line)
+
+ if ( lineNumber != bundle.getString(NOLINE_KEY) ) {
+ hyperlink = "" + lineNumber + ""
+ } else {
+ hyperlink = lineNumber
+ }
+
+ return hyperlink
+ }
+
+ /**
+ * Gets the report title.
+ *
+ * @return The report title.
+ *
+ */
+ protected String getReportTitle() {
+ return bundle.getString(REPORT_TITLE_KEY)
+ }
+
+ /**
+ * Initialized a bug report section in the report for a particular class.
+ */
+ protected void openClassReportSection(String bugClass) {
+ String columnBugText = bundle.getString(COLUMN_BUG_KEY)
+ String columnBugCategory = bundle.getString(COLUMN_CATEGORY_KEY)
+ String columnDescriptionLink = bundle.getString(COLUMN_DETAILS_KEY)
+ String columnLineText = bundle.getString(COLUMN_LINE_KEY)
+ String priorityText = bundle.getString(COLUMN_PRIORITY_KEY)
+
+ log.debug("openClassReportSection bugClass is ${bugClass}")
+
+ log.debug("Opening Class Report Section")
+
+ sink.anchor(bugClass)
+ sink.anchor_()
+
+ sink.section2()
+ sink.sectionTitle2()
+ sink.text(bugClass)
+ sink.sectionTitle2_()
+ sink.table()
+ sink.tableRow()
+
+ // bug
+ sink.tableHeaderCell()
+ sink.text(columnBugText)
+ sink.tableHeaderCell_()
+
+ // category
+ sink.tableHeaderCell()
+ sink.text(columnBugCategory)
+ sink.tableHeaderCell_()
+
+ // description link
+ sink.tableHeaderCell()
+ sink.text(columnDescriptionLink)
+ sink.tableHeaderCell_()
+
+ // line
+ sink.tableHeaderCell()
+ sink.text(columnLineText)
+ sink.tableHeaderCell_()
+
+ // priority
+ sink.tableHeaderCell()
+ sink.text(priorityText)
+ sink.tableHeaderCell_()
+
+ sink.tableRow_()
+ }
+
+ /**
+ * Print the Summary Section.
+ */
+ protected void printSummary() {
+
+ log.debug("Entering printSummary")
+
+ sink.section1()
+
+ // the summary section
+ sink.sectionTitle1()
+ sink.text(bundle.getString(SUMMARY_KEY))
+ sink.sectionTitle1_()
+
+ sink.table()
+ sink.tableRow()
+
+ // classes
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_CLASSES_KEY))
+ sink.tableHeaderCell_()
+
+ // bugs
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_BUGS_KEY))
+ sink.tableHeaderCell_()
+
+ // Errors
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_ERRORS_KEY))
+ sink.tableHeaderCell_()
+
+ // Missing Classes
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_MISSINGCLASSES_KEY))
+ sink.tableHeaderCell_()
- sink.tableRow_()
+ sink.tableRow_()
- sink.tableRow()
+ sink.tableRow()
- // files
- sink.tableCell()
- sink.text(spotbugsResults.FindBugsSummary.@total_classes.text())
- sink.tableCell_()
+ // files
+ sink.tableCell()
+ sink.text(spotbugsResults.FindBugsSummary.@total_classes.text())
+ sink.tableCell_()
- // bug
- sink.tableCell()
- sink.text(spotbugsResults.FindBugsSummary.@total_bugs.text())
- sink.tableCell_()
+ // bug
+ sink.tableCell()
+ sink.text(spotbugsResults.FindBugsSummary.@total_bugs.text())
+ sink.tableCell_()
- // Errors
- sink.tableCell()
- sink.text(spotbugsResults.Errors.@errors.text())
- sink.tableCell_()
+ // Errors
+ sink.tableCell()
+ sink.text(spotbugsResults.Errors.@errors.text())
+ sink.tableCell_()
- // Missing Classes
- sink.tableCell()
- sink.text(spotbugsResults.Errors.@missingClasses.text())
- sink.tableCell_()
+ // Missing Classes
+ sink.tableCell()
+ sink.text(spotbugsResults.Errors.@missingClasses.text())
+ sink.tableCell_()
- sink.tableRow_()
- sink.table_()
+ sink.tableRow_()
+ sink.table_()
- sink.section1_()
+ sink.section1_()
- log.debug("Exiting printSummary")
- }
+ log.debug("Exiting printSummary")
+ }
- /**
- * Print the File Summary Section.
- */
- protected void printFilesSummary() {
- log.debug("Entering printFilesSummary")
+ /**
+ * Print the File Summary Section.
+ */
+ protected void printFilesSummary() {
+ log.debug("Entering printFilesSummary")
- sink.section1()
+ sink.section1()
- // the Files section
- sink.sectionTitle1()
- sink.text(bundle.getString(FILES_KEY))
- sink.sectionTitle1_()
+ // the Files section
+ sink.sectionTitle1()
+ sink.text(bundle.getString(FILES_KEY))
+ sink.sectionTitle1_()
- /**
- * Class Summary
- */
+ /**
+ * Class Summary
+ */
- sink.table()
- sink.tableRow()
+ sink.table()
+ sink.tableRow()
- // files
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_CLASS_KEY))
- sink.tableHeaderCell_()
+ // files
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_CLASS_KEY))
+ sink.tableHeaderCell_()
- // bugs
- sink.tableHeaderCell()
- sink.text(bundle.getString(COLUMN_BUGS_KEY))
- sink.tableHeaderCell_()
+ // bugs
+ sink.tableHeaderCell()
+ sink.text(bundle.getString(COLUMN_BUGS_KEY))
+ sink.tableHeaderCell_()
- sink.tableRow_()
+ sink.tableRow_()
- spotbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
+ spotbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
- def classStatsValue = classStats.'@class'.text()
- def classStatsBugCount = classStats.'@bugs'.text()
+ def classStatsValue = classStats.'@class'.text()
+ def classStatsBugCount = classStats.'@bugs'.text()
- if ( Integer.parseInt(classStatsBugCount) > 0 ) {
- sink.tableRow()
+ if ( Integer.parseInt(classStatsBugCount) > 0 ) {
+ sink.tableRow()
- // class name
- sink.tableCell()
- sink.link("#" + classStatsValue)
- sink.text(classStatsValue)
- sink.link_()
- sink.tableCell_()
+ // class name
+ sink.tableCell()
+ sink.link("#" + classStatsValue)
+ sink.text(classStatsValue)
+ sink.link_()
+ sink.tableCell_()
- // class bug total count
- sink.tableCell()
- sink.text(classStatsBugCount)
- sink.tableCell_()
+ // class bug total count
+ sink.tableCell()
+ sink.text(classStatsBugCount)
+ sink.tableCell_()
- sink.tableRow_()
+ sink.tableRow_()
- bugClasses << classStatsValue
- }
- }
+ bugClasses << classStatsValue
+ }
+ }
- sink.table_()
+ sink.table_()
- sink.section1_()
+ sink.section1_()
- log.debug("Exiting printFilesSummary")
- }
+ log.debug("Exiting printFilesSummary")
+ }
- public void generateReport() {
+ public void generateReport() {
- log.debug("Reporter Locale is " + this.bundle.getLocale().getLanguage())
+ log.debug("Reporter Locale is " + this.bundle.getLocale().getLanguage())
- doHeading()
+ doHeading()
- printSummary()
+ printSummary()
- printFilesSummary()
+ printFilesSummary()
- printBody()
+ printBody()
- log.debug("Closing up report....................")
+ log.debug("Closing up report....................")
- sink.flush()
- sink.close()
- }
+ sink.flush()
+ sink.close()
+ }
- /**
- * Return the value to display. If SpotBugs does not provide a line number, a default message is returned. The line
- * number otherwise.
- *
- * @param line
- * The line to get the value from.
- * @return The line number the bug appears or a statement that there is no source line available.
- *
- */
- protected String valueForLine(GPathResult line)
- {
- String value
+ /**
+ * Return the value to display. If SpotBugs does not provide a line number, a default message is returned. The line
+ * number otherwise.
+ *
+ * @param line
+ * The line to get the value from.
+ * @return The line number the bug appears or a statement that there is no source line available.
+ *
+ */
+ protected String valueForLine(GPathResult line)
+ {
+ String value
- if ( line ) {
- def startLine = line.@start.text()
- def endLine = line.@end.text()
+ if ( line ) {
+ def startLine = line.@start.text()
+ def endLine = line.@end.text()
- if ( startLine == endLine ) {
- if ( startLine ) {
- value = startLine
- } else {
- value = bundle.getString(NOLINE_KEY)
- }
- } else {
- value = startLine + "-" + endLine
- }
- } else {
- value = bundle.getString(NOLINE_KEY)
- }
+ if ( startLine == endLine ) {
+ if ( startLine ) {
+ value = startLine
+ } else {
+ value = bundle.getString(NOLINE_KEY)
+ }
+ } else {
+ value = startLine + "-" + endLine
+ }
+ } else {
+ value = bundle.getString(NOLINE_KEY)
+ }
- return value
- }
+ return value
+ }
}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
index 21b32d534..18a776465 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/XDocsReporter.groovy
@@ -29,209 +29,210 @@ import org.apache.maven.plugin.logging.Log
*/
class XDocsReporter {
- /**
- * The key to get the value if the line number is not available.
- *
- */
- static final String NOLINE_KEY = "report.spotbugs.noline"
-
- /**
- * The bundle to get the messages from.
- *
- */
- ResourceBundle bundle
-
- /**
- * The logger to write logs to.
- *
- */
- Log log
-
- /**
- * The threshold of bugs severity.
- *
- */
- String threshold
-
- /**
- * The used effort for searching bugs.
- *
- */
- String effort
-
- /**
- * The output Writer stream.
- *
- */
- Writer outputWriter
-
- GPathResult spotbugsResults
-
- List bugClasses
-
- /**
- * The directories containing the sources to be compiled.
- *
- */
- List compileSourceRoots
-
- List testSourceRoots
-
- String outputEncoding
-
- /**
- * Default constructor.
- *
- * @param bundle - The Resource Bundle to use
- */
- XDocsReporter(ResourceBundle bundle, Log log, String threshold, String effort, String outputEncoding) {
- assert bundle
- assert log
- assert threshold
- assert effort
- assert outputEncoding
-
- this.bundle = bundle
- this.log = log
- this.threshold = threshold
- this.effort = effort
- this.outputEncoding = outputEncoding
-
- this.outputWriter = null
- this.spotbugsResults = null
-
- this.compileSourceRoots = []
- this.testSourceRoots = []
- this.bugClasses = []
- }
-
- /**
- * Returns the threshold string value for the integer input.
- *
- * @param thresholdValue
- * The ThresholdValue integer to evaluate.
- * @return The string valueof the Threshold object.
- *
- */
- protected String evaluateThresholdParameter(String thresholdValue) {
- String thresholdName
-
- switch ( thresholdValue ) {
- case "1":
- thresholdName = "High"
- break
- case "2":
- thresholdName = "Normal"
- break
- case "3":
- thresholdName = "Low"
- break
- case "4":
- thresholdName = "Exp"
- break
- case "5":
- thresholdName = "Ignore"
- break
- default:
- thresholdName = "Invalid Priority"
- }
-
- return thresholdName
- }
-
- /**
- * Gets the Spotbugs Version of the report.
- *
- * @return The Spotbugs Version used on the report.
- *
- */
- protected String getSpotBugsVersion() {
- return edu.umd.cs.findbugs.Version.VERSION_STRING
- }
-
- public void generateReport() {
-
- def xmlBuilder = new StreamingMarkupBuilder()
- xmlBuilder.encoding = "UTF-8"
-
- def xdoc = {
- mkp.xmlDeclaration()
- log.debug("generateReport spotbugsResults is ${spotbugsResults}")
-
- BugCollection(version: getSpotBugsVersion(), threshold: SpotBugsInfo.spotbugsThresholds.get(threshold), effort: SpotBugsInfo.spotbugsEfforts.get(effort)) {
-
- log.debug("spotbugsResults.FindBugsSummary total_bugs is ${spotbugsResults.FindBugsSummary.@total_bugs.text()}")
-
- spotbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
-
- def classStatsValue = classStats.'@class'.text()
- def classStatsBugCount = classStats.'@bugs'.text()
-
- log.debug("classStats...")
- log.debug("classStatsValue is ${classStatsValue}")
- log.debug("classStatsBugCount is ${classStatsBugCount}")
-
- if ( Integer.parseInt(classStatsBugCount) > 0 ) {
- bugClasses << classStatsValue
- }
- }
-
- bugClasses.each() {bugClass ->
- log.debug("finish bugClass is ${bugClass}")
- file(classname: bugClass) {
- spotbugsResults.BugInstance.each() {bugInstance ->
-
- if ( bugInstance.Class.find{ it.@primary == "true" }.@classname.text() == bugClass ) {
-
- def type = bugInstance.@type.text()
- def category = bugInstance.@category.text()
- def message = bugInstance.LongMessage.text()
- def priority = evaluateThresholdParameter(bugInstance.@priority.text())
- def line = bugInstance.SourceLine.@start[0].text()
- log.debug("BugInstance message is ${message}")
-
- BugInstance(type: type, priority: priority, category: category, message: message, lineNumber: ((line) ? line: "-1"))
- }
- }
- }
- }
-
- log.debug("Printing Errors")
- Error() {
- spotbugsResults.Error.analysisError.each() {analysisError ->
- AnalysisError(analysisError.message.text())
- }
-
- log.debug("Printing Missing classes")
-
- spotbugsResults.Error.MissingClass.each() {missingClass ->
- MissingClass(missingClass.text)
- }
- }
-
- Project() {
- log.debug("Printing Source Roots")
-
- if ( !compileSourceRoots.isEmpty() ) {
- compileSourceRoots.each() {srcDir ->
- log.debug("SrcDir is ${srcDir}")
- SrcDir(srcDir)
- }
- }
-
- if ( !testSourceRoots.isEmpty() ) {
- testSourceRoots.each() {srcDir ->
- log.debug("SrcDir is ${srcDir}")
- SrcDir(srcDir)
- }
- }
- }
- }
- }
-
- outputWriter << xmlBuilder.bind(xdoc)
- outputWriter.flush()
- outputWriter.close()
-
- }
+ /**
+ * The key to get the value if the line number is not available.
+ *
+ */
+ static final String NOLINE_KEY = "report.spotbugs.noline"
+
+ /**
+ * The bundle to get the messages from.
+ *
+ */
+ ResourceBundle bundle
+
+ /**
+ * The logger to write logs to.
+ *
+ */
+ Log log
+
+ /**
+ * The threshold of bugs severity.
+ *
+ */
+ String threshold
+
+ /**
+ * The used effort for searching bugs.
+ *
+ */
+ String effort
+
+ /**
+ * The output Writer stream.
+ *
+ */
+ Writer outputWriter
+
+ GPathResult spotbugsResults
+
+ List bugClasses
+
+ /**
+ * The directories containing the sources to be compiled.
+ *
+ */
+ List compileSourceRoots
+
+ List testSourceRoots
+
+ String outputEncoding
+
+ /**
+ * Default constructor.
+ *
+ * @param bundle - The Resource Bundle to use
+ */
+ XDocsReporter(ResourceBundle bundle, Log log, String threshold, String effort, String outputEncoding) {
+ assert bundle
+ assert log
+ assert threshold
+ assert effort
+ assert outputEncoding
+
+ this.bundle = bundle
+ this.log = log
+ this.threshold = threshold
+ this.effort = effort
+ this.outputEncoding = outputEncoding
+
+ this.outputWriter = null
+ this.spotbugsResults = null
+
+ this.compileSourceRoots = []
+ this.testSourceRoots = []
+ this.bugClasses = []
+ }
+
+ /**
+ * Returns the threshold string value for the integer input.
+ *
+ * @param thresholdValue
+ * The ThresholdValue integer to evaluate.
+ * @return The string valueof the Threshold object.
+ *
+ */
+ protected String evaluateThresholdParameter(String thresholdValue) {
+ String thresholdName
+
+ switch ( thresholdValue ) {
+ case "1":
+ thresholdName = "High"
+ break
+ case "2":
+ thresholdName = "Normal"
+ break
+ case "3":
+ thresholdName = "Low"
+ break
+ case "4":
+ thresholdName = "Exp"
+ break
+ case "5":
+ thresholdName = "Ignore"
+ break
+ default:
+ thresholdName = "Invalid Priority"
+ }
+
+ return thresholdName
+ }
+
+ /**
+ * Gets the Spotbugs Version of the report.
+ *
+ * @return The Spotbugs Version used on the report.
+ *
+ */
+ protected String getSpotBugsVersion() {
+ return edu.umd.cs.findbugs.Version.VERSION_STRING
+ }
+
+ public void generateReport() {
+
+ def xmlBuilder = new StreamingMarkupBuilder()
+ xmlBuilder.encoding = "UTF-8"
+
+ def xdoc = {
+ mkp.xmlDeclaration()
+ log.debug("generateReport spotbugsResults is ${spotbugsResults}")
+
+ BugCollection(version: getSpotBugsVersion(), threshold: SpotBugsInfo.spotbugsThresholds.get(threshold), effort: SpotBugsInfo.spotbugsEfforts.get(effort)) {
+
+ log.debug("spotbugsResults.FindBugsSummary total_bugs is ${spotbugsResults.FindBugsSummary.@total_bugs.text()}")
+
+ spotbugsResults.FindBugsSummary.PackageStats.ClassStats.each() {classStats ->
+
+ def classStatsValue = classStats.'@class'.text()
+ def classStatsBugCount = classStats.'@bugs'.text()
+
+ log.debug("classStats...")
+ log.debug("classStatsValue is ${classStatsValue}")
+ log.debug("classStatsBugCount is ${classStatsBugCount}")
+
+ if ( Integer.parseInt(classStatsBugCount) > 0 ) {
+ bugClasses << classStatsValue
+ }
+ }
+
+ bugClasses.each() {bugClass ->
+ log.debug("finish bugClass is ${bugClass}")
+ file(classname: bugClass) {
+ spotbugsResults.BugInstance.each() {bugInstance ->
+
+ if ( bugInstance.Class.find{ it.@primary == "true" }.@classname.text() == bugClass ) {
+
+ def type = bugInstance.@type.text()
+ def category = bugInstance.@category.text()
+ def message = bugInstance.LongMessage.text()
+ def priority = evaluateThresholdParameter(bugInstance.@priority.text())
+ def line = bugInstance.SourceLine.@start[0].text()
+ log.debug("BugInstance message is ${message}")
+
+ BugInstance(type: type, priority: priority, category: category, message: message, lineNumber: ((line) ? line: "-1"))
+ }
+ }
+ }
+ }
+
+ log.debug("Printing Errors")
+
+ Error() {
+ spotbugsResults.Error.analysisError.each() {analysisError ->
+ AnalysisError(analysisError.message.text())
+ }
+
+ log.debug("Printing Missing classes")
+
+ spotbugsResults.Error.MissingClass.each() {missingClass ->
+ MissingClass(missingClass.text)
+ }
+ }
+
+ Project() {
+ log.debug("Printing Source Roots")
+
+ if ( !compileSourceRoots.isEmpty() ) {
+ compileSourceRoots.each() {srcDir ->
+ log.debug("SrcDir is ${srcDir}")
+ SrcDir(srcDir)
+ }
+ }
+
+ if (!testSourceRoots.isEmpty()) {
+ testSourceRoots.each() {srcDir ->
+ log.debug("SrcDir is ${srcDir}")
+ SrcDir(srcDir)
+ }
+ }
+ }
+ }
+ }
+
+ outputWriter << xmlBuilder.bind(xdoc)
+ outputWriter.flush()
+ outputWriter.close()
+
+ }
}
From 1982ae130bcac9810d4c42b99af72dcba387f070 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 29 Mar 2020 01:47:19 -0400
Subject: [PATCH 0387/1013] [todo] Mark TODO around code noted to fix upon
groovy fix which occurred in 2018
---
.../org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
index 0c7c95eb7..449d41631 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsPluginsTrait.groovy
@@ -47,6 +47,7 @@ trait SpotBugsPluginsTrait {
abstract Log getLog()
abstract ResourceManager getResourceManager()
+ // TODO This has been fixed for 2 years now, apply as noted...
// properties in traits should be supported but don't compile currently:
// https://issues.apache.org/jira/browse/GROOVY-7536
// when fixed, should move pluginList and plugins properties here
From 471d7620955c79a1e857a3c9fe5e2720e17e4220 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sun, 5 Apr 2020 01:05:22 +0000
Subject: [PATCH 0388/1013] Bump asm.version from 7.3.1 to 8.0.1
Bumps `asm.version` from 7.3.1 to 8.0.1.
Updates `asm` from 7.3.1 to 8.0.1
Updates `asm-analysis` from 7.3.1 to 8.0.1
Updates `asm-commons` from 7.3.1 to 8.0.1
Updates `asm-tree` from 7.3.1 to 8.0.1
Updates `asm-util` from 7.3.1 to 8.0.1
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a0493657e..4e581b1a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
5.7.0.202003110725-r
- 7.3.1
+ 8.0.11.9.41.21.14
From 238f2f360c673811c32922f5a00ae7d75337ee80 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 29 Mar 2020 19:40:53 -0400
Subject: [PATCH 0389/1013] [pom] Use jcl-over-slf4j instead of obsolete
commons-logging
we use slf4j otherwise
---
pom.xml | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4e581b1a0..b8e844c64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,9 +199,14 @@
- org.slf4j
- slf4j-simple
- ${slf4jVersion}
+ org.slf4j
+ jcl-over-slf4j
+ ${slf4jVersion}
+
+
+ org.slf4j
+ slf4j-simple
+ ${slf4jVersion}
@@ -308,6 +313,12 @@
org.apache.maven.doxiadoxia-core${doxiaVersion}
+
+
+ commons-logging
+ commons-logging
+
+ org.apache.maven.doxia
@@ -348,6 +359,10 @@
dom4jdom4j
+
+ commons-logging
+ commons-logging
+
@@ -361,6 +376,12 @@
commons-beanutilscommons-beanutils${beanutils.version}
+
+
+ commons-logging
+ commons-logging
+
+ commons-chain
@@ -381,6 +402,12 @@
commons-digestercommons-digester${digester.version}
+
+
+ commons-logging
+ commons-logging
+
+ commons-io
@@ -396,6 +423,12 @@
commons-validatorcommons-validator${validator.version}
+
+
+ commons-logging
+ commons-logging
+
+
From e73df298097599da2e7b6d65b2978ca72761ad87 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 28 Mar 2020 20:43:10 -0400
Subject: [PATCH 0390/1013] [ci] Add missing @override
---
.../org/codehaus/mojo/spotbugs/SpotBugsGui.groovy | 1 +
.../org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 10 ++++++++++
.../mojo/spotbugs/SpotbugsViolationCheckMojo.groovy | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
index 32962e19d..936909be0 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsGui.groovy
@@ -187,6 +187,7 @@ class SpotBugsGui extends AbstractMojo implements SpotBugsPluginsTrait {
@Component(role = ResourceManager.class)
ResourceManager resourceManager
+ @Override
void execute() {
def ant = new AntBuilder()
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index be0258d0b..75b4c0e58 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -534,6 +534,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return true if report can be generated, otherwise false
* @see org.apache.maven.reporting.MavenReport#canGenerateReport()
*/
+ @Override
boolean canGenerateReport() {
def canGenerate = false
@@ -591,6 +592,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return description of the report
* @see org.apache.maven.reporting.MavenReport#getDescription(java.util.Locale)
*/
+ @Override
String getDescription(Locale locale) {
return getBundle(locale).getString(SpotBugsInfo.DESCRIPTION_KEY)
}
@@ -604,6 +606,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return name of the report
* @see org.apache.maven.reporting.MavenReport#getName(java.util.Locale)
*/
+ @Override
String getName(Locale locale) {
return getBundle(locale).getString(SpotBugsInfo.NAME_KEY)
}
@@ -616,6 +619,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return name of the generated page
* @see org.apache.maven.reporting.MavenReport#getOutputName()
*/
+ @Override
String getOutputName() {
return SpotBugsInfo.PLUGIN_NAME
}
@@ -629,6 +633,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
*
* @see org.apache.maven.reporting.MavenReport #executeReport(java.util.Locale)
*/
+ @Override
void executeReport(Locale locale) {
log.debug("****** SpotBugsMojo executeReport *******")
@@ -695,6 +700,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
}
+ @Override
public void execute() {
log.debug("****** SpotBugsMojo execute *******")
@@ -754,6 +760,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return full path to the directory where the files in the site get copied to
* @see org.apache.maven.reporting.AbstractMavenReport#getOutputDirectory()
*/
+ @Override
protected String getOutputDirectory() {
return outputDirectory.getAbsolutePath()
}
@@ -764,6 +771,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* @return the project.
* @see org.apache.maven.reporting.AbstractMavenReport#getProject()
*/
+ @Override
protected MavenProject getProject() {
return this.project
}
@@ -772,6 +780,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* Return the Site Renderer.
*
*/
+ @Override
protected Renderer getSiteRenderer() {
return this.siteRenderer
}
@@ -1187,6 +1196,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
/**
* @see org.apache.maven.reporting.AbstractMavenReport#setReportOutputDirectory(java.io.File)
*/
+ @Override
public void setReportOutputDirectory(File reportOutputDirectory) {
super.setReportOutputDirectory(reportOutputDirectory)
this.outputDirectory = reportOutputDirectory
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index 542ff8b69..c0ab75193 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -480,7 +480,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
@Parameter( property="spotbugs.maxAllowedViolations" , defaultValue = "0")
int maxAllowedViolations
-
+ @Override
void execute() {
Locale locale = Locale.getDefault()
List sourceFiles
From 48cf438479a04f23fb22526a3653f8e46a6758db Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 29 Mar 2020 19:41:41 -0400
Subject: [PATCH 0391/1013] [pom] Use groovy indy components only, we require
java 8 so no need to care about java 6
we use slf4j otherwise
---
pom.xml | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 80 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index b8e844c64..b8a3f1307 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,14 +229,22 @@
${groovyVersion}indy
-
- org.apache.ant
- ant-junit
-
-
- org.apache.ant
- ant-antlr
-
+
+ org.apache.ant
+ ant-junit
+
+
+ org.apache.ant
+ ant-antlr
+
+
+ org.codehaus.groovy
+ groovy
+
+
+ org.codehaus.groovy
+ groovy-groovydoc
+
@@ -245,18 +253,82 @@
groovy-dateutil${groovyVersion}indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
+
+
+
+ org.codehaus.groovy
+ groovy-docgenerator
+ ${groovyVersion}
+ runtime
+ indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
+ org.codehaus.groovy
+ groovy-templates
+
+ org.codehaus.groovygroovy-groovydoc${groovyVersion}
+ indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
+ org.codehaus.groovy
+ groovy-docgenerator
+
+
+ org.codehaus.groovy
+ groovy-templates
+
+
+
+
+
+ org.codehaus.groovy
+ groovy-templates
+ ${groovyVersion}
+ runtime
+ indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
+ org.codehaus.groovy
+ groovy-xml
+
+ org.codehaus.groovygroovy-xml${groovyVersion}
+ indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
From df735f30b2249d32d6e55f476eb32ffe3d42fe90 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 17:13:30 -0400
Subject: [PATCH 0392/1013] [pom] Bump gmaven plugin to 1.9.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b8a3f1307..d401ccbf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
1.81.80.22-1
- 1.8.1
+ 1.9.03.0.03.2.13.2.0
From 08b09ae75da7cab60e718e0ec2ff7bdfee52f467 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 17:13:56 -0400
Subject: [PATCH 0393/1013] [pom] Use invoke dynamic on our code (indy only) -
we require jdk8
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index d401ccbf1..ebc4aa91b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,6 +634,7 @@
${gmavenPluginVersion}${project.reporting.outputDirectory}/gapidocs
+ true
From 72a72ef50fe611bccf6c80e17fcf076aa3ed06fd Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 17:33:16 -0400
Subject: [PATCH 0394/1013] [travis] Drop openjdk 13 as now obsolete by
official 14
---
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 2957e0021..c9e708252 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ language: java
jdk:
- openjdk15
- openjdk14
- - openjdk13
- openjdk11
- openjdk8
From 213492845243d067946aba7626df1e86179f8a33 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 17:33:32 -0400
Subject: [PATCH 0395/1013] [travis] Move onto bionic beaver builds
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index c9e708252..fbeac5982 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
# See https://docs.travis-ci.com/user/reference/overview/
-dist: xenial
+dist: bionic
language: java
From a5613b620600757804d4f8d780026443c104283a Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 18:00:52 -0400
Subject: [PATCH 0396/1013] [pom] Remove commons-validator as no longer used
and thus no need to override now
---
pom.xml | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index ebc4aa91b..f943c8b28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,6 @@
2.12.63.10
- 1.65.3.2
@@ -491,17 +490,6 @@
commons-lang3${lang3.version}
-
- commons-validator
- commons-validator
- ${validator.version}
-
-
- commons-logging
- commons-logging
-
-
-
From 28987a79508f529828cdd9872d196e25113349b9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 17:51:31 -0400
Subject: [PATCH 0397/1013] [pom] Remove really old duplicate of sisu-guice
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index f943c8b28..485ef42ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -371,6 +371,12 @@
org.apache.maven.sharedmaven-artifact-transfer${mavenTransferVersion}
+
+
+ org.sonatype.sisu
+ sisu-guice
+
+
From 6ee9325bb445170f6d4b177b82939bb67b3bf45d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2020 08:48:01 +0000
Subject: [PATCH 0398/1013] Bump groovyVersion from 3.0.2 to 3.0.3
Bumps `groovyVersion` from 3.0.2 to 3.0.3.
Updates `groovy` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.2 to 3.0.3
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 485ef42ed..29b04b57d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
2.0.0-alpha11.10.7
- 3.0.2
+ 3.0.31.9.11.9.2
From 2a975226ec6f27a0f0f8cabe830634e4d6ae87de Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Apr 2020 09:07:53 +0000
Subject: [PATCH 0399/1013] Bump base-parent from 24 to 25
Bumps [base-parent](https://github.com/hazendaz/base-parent) from 24 to 25.
- [Release notes](https://github.com/hazendaz/base-parent/releases)
- [Commits](https://github.com/hazendaz/base-parent/commits)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 29b04b57d..292a77e84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 24
+ 25
From c7128ea74ad39f94885f8fd23826400cc79e688d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2020 08:26:35 +0000
Subject: [PATCH 0400/1013] Bump maven-antrun-plugin from 1.8 to 3.0.0
Bumps [maven-antrun-plugin](https://github.com/apache/maven-antrun-plugin) from 1.8 to 3.0.0.
- [Release notes](https://github.com/apache/maven-antrun-plugin/releases)
- [Commits](https://github.com/apache/maven-antrun-plugin/compare/maven-antrun-plugin-1.8...maven-antrun-plugin-3.0.0)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 292a77e84..391248282 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
1.1.03.3.0
- 1.8
+ 3.0.01.80.22-11.9.0
From d85f4bf8f1927221dc82241723b1c7ff3bcb38f8 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 16 Apr 2020 13:08:10 +0000
Subject: [PATCH 0401/1013] Bump spotbugs from 4.0.1 to 4.0.2
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.1...4.0.2)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 391248282..b7975926c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.1
- 4.0.1
+ 4.0.24.0.12.0.0-alpha1
From 550fae5629a84799cc78ca627fa93ce9234cfcdb Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 20:52:10 -0400
Subject: [PATCH 0402/1013] [ci] Formatting - spaces
---
.../mojo/spotbugs/SpotBugsMojo.groovy | 6 +-
.../SpotbugsViolationCheckMojo.groovy | 88 +++++++++----------
2 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 75b4c0e58..9b8f13f33 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -169,7 +169,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
boolean addSourceDirs
/**
- * List of artifacts this plugin depends on. Used for resolving the Spotbugs coreplugin.
+ * List of artifacts this plugin depends on. Used for resolving the Spotbugs core plugin.
*
*/
@Parameter(property = "plugin.artifacts", required = true, readonly = true)
@@ -330,7 +330,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
String effort
/**
- * turn on Spotbugs debugging
+ * Turn on Spotbugs debugging.
*
*/
@Parameter(defaultValue = "false", property = "spotbugs.debug")
@@ -461,7 +461,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
boolean failOnError
/**
- * Fork a VM for Spotbugs analysis. This will allow you to set timeouts and heap size
+ * Fork a VM for Spotbugs analysis. This will allow you to set timeouts and heap size.
*
* @since 2.3.2
*/
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index c0ab75193..a04af08a3 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -61,7 +61,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
* Location where generated html will be created.
*
*/
- @Parameter( defaultValue = '${project.reporting.outputDirectory}', required = true )
+ @Parameter(defaultValue = '${project.reporting.outputDirectory}', required = true)
File outputDirectory
/**
@@ -69,7 +69,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0.0
*/
- @Parameter( defaultValue = "false", property="spotbugs.xmlOutput", required = true )
+ @Parameter(defaultValue = "false", property = "spotbugs.xmlOutput", required = true)
boolean xmlOutput
/**
@@ -77,7 +77,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0.0
*/
- @Parameter( defaultValue = '${project.build.directory}', required = true )
+ @Parameter(defaultValue = '${project.build.directory}', required = true)
File xmlOutputDirectory
/**
@@ -87,7 +87,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
*/
@Deprecated
- @Parameter( defaultValue = "true" )
+ @Parameter(defaultValue = "true")
boolean spotbugsXmlOutput
/**
@@ -95,7 +95,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.2.0
*/
- @Parameter( defaultValue = '${project.build.directory}', required = true )
+ @Parameter(defaultValue = '${project.build.directory}', required = true)
File spotbugsXmlOutputDirectory
/**
@@ -109,41 +109,41 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
/**
* Doxia Site Renderer.
*/
- @Component( role = Renderer.class)
+ @Component(role = Renderer.class)
Renderer siteRenderer
/**
* Directory containing the class files for Spotbugs to analyze.
*/
- @Parameter( defaultValue = '${project.build.outputDirectory}', required = true )
+ @Parameter(defaultValue = '${project.build.outputDirectory}', required = true)
File classFilesDirectory
/**
* Directory containing the test class files for Spotbugs to analyze.
*
*/
- @Parameter( defaultValue = '${project.build.testOutputDirectory}', required = true )
+ @Parameter(defaultValue = '${project.build.testOutputDirectory}', required = true)
File testClassFilesDirectory
/**
* Location of the Xrefs to link to.
*
*/
- @Parameter( defaultValue = '${project.reporting.outputDirectory}/xref' )
+ @Parameter(defaultValue = '${project.reporting.outputDirectory}/xref')
File xrefLocation
/**
* Location of the Test Xrefs to link to.
*
*/
- @Parameter( defaultValue = '${project.reporting.outputDirectory}/xref-test' )
+ @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 )
+ @Parameter(defaultValue = '${project.compileSourceRoots}', required = true, readonly = true)
List compileSourceRoots
/**
@@ -151,7 +151,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.0
*/
- @Parameter( defaultValue = '${project.testCompileSourceRoots}', required = true, readonly = true )
+ @Parameter(defaultValue = '${project.testCompileSourceRoots}', required = true, readonly = true)
List testSourceRoots
/**
@@ -159,28 +159,28 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.0
*/
- @Parameter( defaultValue = "false", property="spotbugs.includeTests" )
+ @Parameter(defaultValue = "false", property = "spotbugs.includeTests")
boolean includeTests
/**
* List of artifacts this plugin depends on. Used for resolving the Spotbugs core plugin.
*
*/
- @Parameter( property="plugin.artifacts", required = true, readonly = true )
+ @Parameter(property = "plugin.artifacts", required = true, readonly = true)
List pluginArtifacts
/**
* The local repository, needed to download the coreplugin jar.
*
*/
- @Parameter( property="localRepository", required = true, readonly = true )
+ @Parameter(property = "localRepository", required = true, readonly = true)
ArtifactRepository localRepository
/**
* Remote repositories which will be searched for the coreplugin jar.
*
*/
- @Parameter( property="project.remoteArtifactRepositories", required = true, readonly = true )
+ @Parameter(property = "project.remoteArtifactRepositories", required = true, readonly = true)
List remoteArtifactRepositories
/**
@@ -193,14 +193,14 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
* Maven Project.
*
*/
- @Parameter( property="project", required = true, readonly = true )
+ @Parameter(property = "project", required = true, readonly = true)
MavenProject project
/**
* Encoding used for xml files. Default value is UTF-8.
*
*/
- @Parameter( defaultValue = "UTF-8", readonly = true )
+ @Parameter(defaultValue = "UTF-8", readonly = true)
String xmlEncoding
/**
@@ -209,7 +209,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.2
*/
- @Parameter( defaultValue = '${project.build.sourceEncoding}', property="encoding" )
+ @Parameter(defaultValue = '${project.build.sourceEncoding}', property = "encoding")
String sourceEncoding
/**
@@ -218,20 +218,20 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.2
*/
- @Parameter( defaultValue = '${project.reporting.outputEncoding}', property="outputEncoding" )
+ @Parameter(defaultValue = '${project.reporting.outputEncoding}', property = "outputEncoding")
String outputEncoding
/**
* Threshold of minimum bug severity to report. Valid values are High, Default, Low, Ignore, and Exp (for experimental).
*
*/
- @Parameter( defaultValue = "Default", property="spotbugs.threshold" )
+ @Parameter(defaultValue = "Default", property = "spotbugs.threshold")
String threshold
/**
* Artifact resolver, needed to download the coreplugin jar.
*/
- @Component( role = ArtifactResolver.class )
+ @Component(role = ArtifactResolver.class)
ArtifactResolver artifactResolver
/**
@@ -253,7 +253,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="spotbugs.includeFilterFile" )
+ @Parameter(property = "spotbugs.includeFilterFile")
String includeFilterFile
/**
@@ -275,7 +275,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="spotbugs.excludeFilterFile" )
+ @Parameter(property = "spotbugs.excludeFilterFile")
String excludeFilterFile
/**
@@ -298,7 +298,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="spotbugs.excludeBugsFile" )
+ @Parameter(property = "spotbugs.excludeBugsFile")
String excludeBugsFile
/**
@@ -306,14 +306,14 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( defaultValue = "Default", property="spotbugs.effort" )
+ @Parameter(defaultValue = "Default", property = "spotbugs.effort")
String effort
/**
* Turn on Spotbugs debugging.
*
*/
- @Parameter( defaultValue = "false", property="spotbugs.debug" )
+ @Parameter(defaultValue = "false", property = "spotbugs.debug")
Boolean debug
/**
@@ -322,7 +322,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( defaultValue = "false", property="spotbugs.relaxed" )
+ @Parameter(defaultValue = "false", property = "spotbugs.relaxed")
Boolean relaxed
/**
@@ -330,7 +330,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="spotbugs.visitors" )
+ @Parameter(property = "spotbugs.visitors")
String visitors
/**
@@ -338,7 +338,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.0-beta-1
*/
- @Parameter( property="spotbugs.omitVisitors" )
+ @Parameter(property = "spotbugs.omitVisitors")
String omitVisitors
/**
@@ -367,7 +367,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( property="spotbugs.onlyAnalyze" )
+ @Parameter(property = "spotbugs.onlyAnalyze")
String onlyAnalyze
/**
@@ -376,7 +376,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.3.2
*/
- @Parameter( property="spotbugs.nested", defaultValue = "false" )
+ @Parameter(property = "spotbugs.nested", defaultValue = "false")
Boolean nested
/**
@@ -385,7 +385,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.3.2
*/
- @Parameter( property="spotbugs.trace", defaultValue = "false" )
+ @Parameter(property = "spotbugs.trace", defaultValue = "false")
Boolean trace
/**
@@ -393,7 +393,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="spotbugs.maxRank" )
+ @Parameter(property = "spotbugs.maxRank")
int maxRank
/**
@@ -401,7 +401,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 1.1
*/
- @Parameter( property="spotbugs.skip", defaultValue = "false" )
+ @Parameter(property = "spotbugs.skip", defaultValue = "false")
boolean skip
/**
@@ -409,7 +409,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.0
*/
- @Component( role = ResourceManager.class)
+ @Component(role = ResourceManager.class)
ResourceManager resourceManager
/**
@@ -417,7 +417,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.1-SNAPSHOT
*/
- @Component( role = SiteTool.class)
+ @Component(role = SiteTool.class)
SiteTool siteTool
/**
@@ -425,7 +425,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.0
*/
- @Parameter( property="spotbugs.failOnError", defaultValue = "true" )
+ @Parameter(property = "spotbugs.failOnError", defaultValue = "true")
boolean failOnError
/**
@@ -433,7 +433,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.3.2
*/
- @Parameter( property="spotbugs.fork", defaultValue = "true" )
+ @Parameter(property = "spotbugs.fork", defaultValue = "true")
boolean fork
/**
@@ -442,7 +442,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.2
*/
- @Parameter( property="spotbugs.maxHeap", defaultValue = "512" )
+ @Parameter(property = "spotbugs.maxHeap", defaultValue = "512")
int maxHeap
/**
@@ -453,7 +453,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.2
*/
- @Parameter( property="spotbugs.timeout", defaultValue = "600000" )
+ @Parameter(property = "spotbugs.timeout", defaultValue = "600000")
int timeout
/**
@@ -463,7 +463,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="spotbugs.jvmArgs" )
+ @Parameter(property = "spotbugs.jvmArgs")
String jvmArgs
int bugCount
@@ -477,7 +477,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
*
* @since 2.4.1
*/
- @Parameter( property="spotbugs.maxAllowedViolations" , defaultValue = "0")
+ @Parameter(property = "spotbugs.maxAllowedViolations", defaultValue = "0")
int maxAllowedViolations
@Override
@@ -498,7 +498,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
log.debug("Here goes...............Executing spotbugs:check")
if (!spotbugsXmlOutputDirectory.exists()) {
- if ( !spotbugsXmlOutputDirectory.mkdirs() ) {
+ if (!spotbugsXmlOutputDirectory.mkdirs()) {
throw new MojoExecutionException("Cannot create xml output directory")
}
}
From 92d19ccf8f591e9de280f81f184a4f428e9083ef Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 5 Apr 2020 20:56:05 -0400
Subject: [PATCH 0403/1013] [cleanup] Extract embedded class to it's own file.
---
.../org/codehaus/mojo/spotbugs/PluginArtifact.groovy | 7 +++++++
.../groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 7 -------
2 files changed, 7 insertions(+), 7 deletions(-)
create mode 100644 src/main/groovy/org/codehaus/mojo/spotbugs/PluginArtifact.groovy
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/PluginArtifact.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/PluginArtifact.groovy
new file mode 100644
index 000000000..e355f8271
--- /dev/null
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/PluginArtifact.groovy
@@ -0,0 +1,7 @@
+package org.codehaus.mojo.spotbugs
+
+class PluginArtifact {
+ String groupId, artifactId, version
+
+ String type = "jar"
+}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 9b8f13f33..8768cb8d3 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -1225,10 +1225,3 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
}
-
-class PluginArtifact {
- String groupId, artifactId, version
-
- String type = "jar"
-}
-
From 96d23130f014cacea43822c90a124c2c1da1dae7 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Apr 2020 17:10:35 -0400
Subject: [PATCH 0404/1013] [pom] Allign completely to spotbugs 4.0.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b7975926c..3309892a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.1-SNAPSHOT
+ 4.0.2-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -120,7 +120,7 @@
5.6.14.0.2
- 4.0.1
+ 4.0.22.0.0-alpha11.10.7
From 517399623208080820563c2ea28494031d70e4fb Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Apr 2020 17:10:45 -0400
Subject: [PATCH 0405/1013] [pom] Bump junit to 5.6.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3309892a2..085171d43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
${project.version}
- 5.6.1
+ 5.6.24.0.24.0.22.0.0-alpha1
From 2a33762125b5f1013dc2cdbe94c8b476ea29913c Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Apr 2020 17:15:35 -0400
Subject: [PATCH 0406/1013] [cleanup] Remove maven 2.2.1 related issue
This project requires maven 3.2.5. The error in question and related fix is from 2005.
---
.../org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 8768cb8d3..6b740b809 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -563,15 +563,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
if (canGenerate && outputSpotbugsFile == null) {
outputSpotbugsFile = new File("${spotbugsXmlOutputDirectory}/${spotbugsXmlOutputFilename}")
- ClassLoader tccl = Thread.currentThread().getContextClassLoader();
- try {
- // The SAX parser factory will fail with CCE if the TCCL is out of sync with our class loader
- // This for Maven 2.2.1 only MFINDBUGS-178
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
- executeSpotbugs(outputSpotbugsFile)
- } finally {
- Thread.currentThread().setContextClassLoader(tccl);
- }
+ executeSpotbugs(outputSpotbugsFile)
if (skipEmptyReport && bugCount == 0) {
canGenerate = false
From 3f3b6bfc57bd7a3419bc4b49059b5bb675bcfcf6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 13 May 2020 09:05:34 +0000
Subject: [PATCH 0407/1013] Bump spotbugs from 4.0.2 to 4.0.3
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.2...4.0.3)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 085171d43..a124d87b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.0.2
+ 4.0.34.0.22.0.0-alpha1
From 2149b19f372777aae069d9b0020304762b848fc1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 14 May 2020 08:45:23 +0000
Subject: [PATCH 0408/1013] Bump ant from 1.10.7 to 1.10.8
Bumps ant from 1.10.7 to 1.10.8.
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a124d87b6..e8b24a6af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
4.0.22.0.0-alpha1
- 1.10.7
+ 1.10.83.0.31.9.1
From bdbb6face71de747e7b280ddd79bf74b493a3936 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 22 May 2020 08:53:15 +0000
Subject: [PATCH 0409/1013] Bump groovyVersion from 3.0.3 to 3.0.4
Bumps `groovyVersion` from 3.0.3 to 3.0.4.
Updates `groovy` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.3 to 3.0.4
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e8b24a6af..be492a227 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
2.0.0-alpha11.10.8
- 3.0.3
+ 3.0.41.9.11.9.2
From ef22be2128cea802848c4feaf4ce5b22cfa4fff9 Mon Sep 17 00:00:00 2001
From: Falko Modler
Date: Sat, 16 May 2020 19:35:13 +0200
Subject: [PATCH 0410/1013] CheckMojo: parse outputFile only once
---
.../SpotbugsViolationCheckMojo.groovy | 29 +++++++------------
1 file changed, 10 insertions(+), 19 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index a04af08a3..f73942c17 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -466,10 +466,6 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
@Parameter(property = "spotbugs.jvmArgs")
String jvmArgs
- int bugCount
-
- int errorCount
-
/**
*
* specified max number of violations which can be ignored by the spotbugs.
@@ -507,31 +503,26 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
if (outputFile.exists()) {
- def path = new XmlSlurper().parse(outputFile)
-
- def allNodes = path.depthFirst().collect { it }
+ def xml = new XmlParser().parse(outputFile)
- bugCount = allNodes.findAll {it.name() == 'BugInstance'}.size()
+ def bugs = xml.BugInstance
+ def bugCount = bugs.size()
log.info("BugInstance size is ${bugCount}")
- errorCount = allNodes.findAll {it.name() == 'Error'}.size()
+ def errorCount = xml.Error.size()
log.info("Error size is ${errorCount}")
- def xml = new XmlParser().parse(outputFile)
- def bugs = xml.BugInstance
- def total = bugs.size()
-
- if (total <= 0) {
+ if (bugCount <= 0) {
log.info('No errors/warnings found')
return
- }else if( maxAllowedViolations > 0 && total <= maxAllowedViolations){
- log.info("total ${total} violations are found which is set to be acceptable using configured property maxAllowedViolations :"+maxAllowedViolations +".\nBelow are list of bugs ignored :\n")
- printBugs(total, bugs)
+ } else if (maxAllowedViolations > 0 && bugCount <= maxAllowedViolations) {
+ log.info("total ${bugCount} violations are found which is set to be acceptable using configured property maxAllowedViolations :"+maxAllowedViolations +".\nBelow are list of bugs ignored :\n")
+ printBugs(bugCount, bugs)
return;
}
- log.info('Total bugs: ' + total)
- for (i in 0..total-1) {
+ log.info('Total bugs: ' + bugCount)
+ for (i in 0..bugCount-1) {
def bug = bugs[i]
log.error( bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK + bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type')
}
From 0cea25a591970f8aa53ee152f690ab7316d17a8a Mon Sep 17 00:00:00 2001
From: Falko Modler
Date: Mon, 25 May 2020 22:04:20 +0200
Subject: [PATCH 0411/1013] CheckMojo: introduce failThreshold
---
src/it/check-fail/verify.groovy | 18 ++++++++
src/it/check-failThreshold/invoker.properties | 4 ++
src/it/check-failThreshold/pom.xml | 44 +++++++++++++++++++
src/it/check-failThreshold/verify.groovy | 19 ++++++++
.../SpotbugsViolationCheckMojo.groovy | 31 +++++++++++--
5 files changed, 113 insertions(+), 3 deletions(-)
create mode 100644 src/it/check-fail/verify.groovy
create mode 100644 src/it/check-failThreshold/invoker.properties
create mode 100644 src/it/check-failThreshold/pom.xml
create mode 100644 src/it/check-failThreshold/verify.groovy
diff --git a/src/it/check-fail/verify.groovy b/src/it/check-fail/verify.groovy
new file mode 100644
index 000000000..c509ec221
--- /dev/null
+++ b/src/it/check-fail/verify.groovy
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.text.contains( '[ERROR] High: Found reliance on default encoding in UserMistakes' )
diff --git a/src/it/check-failThreshold/invoker.properties b/src/it/check-failThreshold/invoker.properties
new file mode 100644
index 000000000..14379f58c
--- /dev/null
+++ b/src/it/check-failThreshold/invoker.properties
@@ -0,0 +1,4 @@
+invoker.goals = clean compile spotbugs:check
+
+# The expected result of the build, possible values are "success" (default) and "failure"
+invoker.buildResult = failure
diff --git a/src/it/check-failThreshold/pom.xml b/src/it/check-failThreshold/pom.xml
new file mode 100644
index 000000000..6a365d6a0
--- /dev/null
+++ b/src/it/check-failThreshold/pom.xml
@@ -0,0 +1,44 @@
+
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ common
+ testing
+ ../common.xml
+
+ check
+ check
+ jar
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+ true
+ true
+ @spotbugsTestDebug@
+ High
+
+
+
+
+
diff --git a/src/it/check-failThreshold/verify.groovy b/src/it/check-failThreshold/verify.groovy
new file mode 100644
index 000000000..cc50632c2
--- /dev/null
+++ b/src/it/check-failThreshold/verify.groovy
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.text.contains( '[WARNING] Medium: Unused public or protected field:' )
+assert buildLog.text.contains( '[ERROR] High: Found reliance on default encoding in UserMistakes' )
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index f73942c17..bc97b2b68 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -428,6 +428,15 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
@Parameter(property = "spotbugs.failOnError", defaultValue = "true")
boolean failOnError
+ /**
+ * Prioritiy threshold which bugs have to reach to cause a failure. Valid values are High, Medium or Low.
+ * Bugs below this threshold will just issue a warning log entry.
+ *
+ * @since 4.0.1
+ */
+ @Parameter(property = "spotbugs.failThreshold")
+ String failThreshold
+
/**
* Fork a VM for Spotbugs analysis. This will allow you to set timeouts and heap size.
*
@@ -522,15 +531,31 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
}
log.info('Total bugs: ' + bugCount)
+ def bugCountAboveThreshold = 0
+ def priorityThresholdNum = failThreshold ? SpotBugsInfo.spotbugsPriority.indexOf(failThreshold) : Integer.MAX_VALUE
+ if (priorityThresholdNum == -1) {
+ throw new MojoExecutionException("Invalid value for failThreshold: ${failThreshold}")
+ }
+
for (i in 0..bugCount-1) {
def bug = bugs[i]
- log.error( bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK + bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type')
+ def priorityNum = bug.'@priority' as int
+ def priorityName = SpotBugsInfo.spotbugsPriority[priorityNum]
+ def logMsg = priorityName + ': ' + bug.LongMessage.text() + SpotBugsInfo.BLANK + bug.SourceLine.'@classname' + SpotBugsInfo.BLANK +
+ bug.SourceLine.Message.text() + SpotBugsInfo.BLANK + bug.'@type'
+
+ if (priorityNum <= priorityThresholdNum) { // lower is more severe
+ bugCountAboveThreshold += 1
+ log.error(logMsg)
+ } else {
+ log.warn(logMsg)
+ }
}
log.info('\n\n\nTo see bug detail using the Spotbugs GUI, use the following command "mvn spotbugs:gui"\n\n\n')
- if ( (bugCount || errorCount) && failOnError ) {
- throw new MojoExecutionException("failed with ${bugCount} bugs and ${errorCount} errors ")
+ if ( (bugCountAboveThreshold || errorCount) && failOnError ) {
+ throw new MojoExecutionException("failed with ${bugCountAboveThreshold} bugs and ${errorCount} errors ")
}
}
}
From d8c17faca6c48120b441fec488dc4209d8d97fd4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 28 May 2020 08:58:16 +0000
Subject: [PATCH 0412/1013] Bump commons-io from 2.6 to 2.7
Bumps commons-io from 2.6 to 2.7.
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index be492a227..98152b4cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
1.143.2.22.1
- 2.6
+ 2.73.10
From f409ca2bfe9228bd1ba3bd964a49be0828252244 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:06:58 +0000
Subject: [PATCH 0413/1013] Bump maven-project-info-reports-plugin from 3.0.0
to 3.1.0
Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.0.0 to 3.1.0.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.0.0...maven-project-info-reports-plugin-3.1.0)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 98152b4cd..61aba9bc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
1.80.22-11.9.0
- 3.0.0
+ 3.1.03.2.13.2.03.6.0
From 045bdf1b5c8784a13c08ddf067f32303abce2c74 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 6 Jun 2020 13:44:15 -0400
Subject: [PATCH 0414/1013] [pom] Exclude groovy testng as we do not use it
see https://groovy-lang.org/releasenotes/groovy-3.0.html due to incorrectly upgrading too soon. While testng showed 7.2.0 released, they have also since retrated the release so it was likely a problem in my opinion.
---
pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pom.xml b/pom.xml
index 98152b4cd..9f7cfe07e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -836,6 +836,13 @@
groovy-all${groovyVersion}pom
+
+
+
+ org.codehaus.groovy
+ groovy-testng
+
+
From 6cdd6842217c1e04036109d89d3e4c1da38c7cad Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 9 Jun 2020 08:47:47 +0000
Subject: [PATCH 0415/1013] Bump spotbugs from 4.0.3 to 4.0.4
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.3...4.0.4)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 456240cfb..05b0cd692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.0.3
+ 4.0.44.0.22.0.0-alpha1
From ff24ceed00f1e4bee8dd4329ed67a6c0bd205664 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 19 Jun 2020 19:43:55 -0400
Subject: [PATCH 0416/1013] [pom] Bump spotbugs tag to 4.0.4 / version to 4.0.4
snapshot
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 05b0cd692..1a61073b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.2-SNAPSHOT
+ 4.0.4-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -120,7 +120,7 @@
5.6.24.0.4
- 4.0.2
+ 4.0.42.0.0-alpha11.10.8
From 084211429b279980589e8b9229d8bf95086189e8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 19 Jun 2020 20:23:32 -0400
Subject: [PATCH 0417/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.0.4
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a61073b2..78184ed75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.4-SNAPSHOT
+ 4.0.4maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.0.4GitHub Issues
From da7d20abffd61771c46258c546157de4b2496bc7 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 19 Jun 2020 20:23:34 -0400
Subject: [PATCH 0418/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 78184ed75..55b635ba7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.4
+ 4.0.5-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.0.4
+ HEADGitHub Issues
From aed2d7e42339bbdef411631c82538dea71a66e32 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Jun 2020 10:25:44 +0000
Subject: [PATCH 0419/1013] Bump base-parent from 25 to 26
Bumps [base-parent](https://github.com/hazendaz/base-parent) from 25 to 26.
- [Release notes](https://github.com/hazendaz/base-parent/releases)
- [Commits](https://github.com/hazendaz/base-parent/commits)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 55b635ba7..78a722aa3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 25
+ 26
From 0130a5d4645342f637e75dadd44d20d5a650ca35 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Jun 2020 09:24:34 +0000
Subject: [PATCH 0420/1013] Bump spotbugs from 4.0.4 to 4.0.6
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.4 to 4.0.6.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.4...4.0.6)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 78a722aa3..fa00175bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.0.4
+ 4.0.64.0.42.0.0-alpha1
From 8538eca70b6997c1a70e6a5c7944fd91487e256d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
<27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 25 Jun 2020 09:04:09 +0000
Subject: [PATCH 0421/1013] Bump maven-site-plugin from 3.9.0 to 3.9.1
Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/apache/maven-site-plugin/releases)
- [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.9.0...maven-site-plugin-3.9.1)
Signed-off-by: dependabot-preview[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fa00175bf..595956d94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
3.2.03.6.01.11.2
- 3.9.0
+ 3.9.13.62.7
From 2697ed516334dd10b9b91ce6bc017817b041311a Mon Sep 17 00:00:00 2001
From: "Sean C. Sullivan"
Date: Sat, 4 Jul 2020 05:02:37 -0700
Subject: [PATCH 0422/1013] enable Dependabot v2
https://github.blog/2020-06-01-keep-all-your-packages-up-to-date-with-dependabot/
---
.github/dependabot.yml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 .github/dependabot.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..daec31893
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
From 973fb04f5e02a0dc80b4d532dfa4448556c28ec2 Mon Sep 17 00:00:00 2001
From: Falko Modler
Date: Wed, 8 Jul 2020 16:23:01 +0200
Subject: [PATCH 0423/1013] CheckMojo: reduce log to info when bug below
threshold
---
src/it/check-failThreshold/verify.groovy | 2 +-
.../codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/it/check-failThreshold/verify.groovy b/src/it/check-failThreshold/verify.groovy
index cc50632c2..00cab90ba 100644
--- a/src/it/check-failThreshold/verify.groovy
+++ b/src/it/check-failThreshold/verify.groovy
@@ -15,5 +15,5 @@
*/
File buildLog = new File( basedir, 'build.log' )
-assert buildLog.text.contains( '[WARNING] Medium: Unused public or protected field:' )
+assert buildLog.text.contains( '[INFO] Medium: Unused public or protected field:' )
assert buildLog.text.contains( '[ERROR] High: Found reliance on default encoding in UserMistakes' )
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
index bc97b2b68..197f12461 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsViolationCheckMojo.groovy
@@ -548,7 +548,7 @@ class SpotbugsViolationCheckMojo extends AbstractMojo {
bugCountAboveThreshold += 1
log.error(logMsg)
} else {
- log.warn(logMsg)
+ log.info(logMsg)
}
}
From 10909993b29480692c219961a97ad01ac4535b3f Mon Sep 17 00:00:00 2001
From: Thomas Kalmar
Date: Wed, 8 Jul 2020 17:40:20 +0200
Subject: [PATCH 0424/1013] Use File api to parse filenames, Fix #34
---
.../org/codehaus/mojo/spotbugs/ResourceHelper.groovy | 11 ++++++-----
.../org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy | 2 --
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
index fcedf6414..857b23eb6 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
@@ -25,6 +25,8 @@ import org.codehaus.plexus.resource.loader.FileResourceLoader
import org.codehaus.plexus.resource.ResourceManager
import org.codehaus.plexus.util.FileUtils
+import java.nio.file.Paths
+
final class ResourceHelper {
Log log
@@ -53,12 +55,11 @@ final class ResourceHelper {
String location = null
String artifact = resource
- if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
- artifact = resource.substring(resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH) + 1)
- }
+ def file = new File(resource)
- if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
- location = resource.substring(0, resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH))
+ if (file.exists()) {
+ artifact = file.getName()
+ location = file.getAbsolutePath()
}
// replace all occurrences of the following characters: ? : & =
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index d66a7fdc8..3c40ceccd 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -77,8 +77,6 @@ interface SpotBugsInfo {
static final String COMMA = ","
- static final String FORWARD_SLASH = '/'
-
/**
* The character to separate URL tokens.
*
From 236b92d9fab90a57ab0e0c18a2ad546c13b0603a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Jul 2020 05:19:31 +0000
Subject: [PATCH 0425/1013] Bump commons-lang3 from 3.10 to 3.11
Bumps commons-lang3 from 3.10 to 3.11.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 595956d94..158087713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,7 @@
3.2.22.12.7
- 3.10
+ 3.115.3.2
From 1d93120cdbd3d59232484bd110fec2c9df394bbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2020 05:44:54 +0000
Subject: [PATCH 0426/1013] Bump groovyVersion from 3.0.4 to 3.0.5
Bumps `groovyVersion` from 3.0.4 to 3.0.5.
Updates `groovy` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.4 to 3.0.5
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 158087713..8347e8f95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
2.0.0-alpha11.10.8
- 3.0.4
+ 3.0.51.9.11.9.2
From 6601195dbd94fa811dcd532d7ba479a5c616eacf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 Jul 2020 05:18:48 +0000
Subject: [PATCH 0427/1013] Bump spotbugs from 4.0.6 to 4.1.1
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.0.6 to 4.1.1.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.0.6...4.1.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8347e8f95..fc677dd2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.0.6
+ 4.1.14.0.42.0.0-alpha1
From e01af9bbfbaa514015ffafc746ae7a2c8b0070ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 06:37:43 +0000
Subject: [PATCH 0428/1013] Bump gmavenplus-plugin from 1.9.0 to 1.10.0
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.9.0 to 1.10.0.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.9.0...1.10.0)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fc677dd2b..da9c80878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.9.0
+ 1.10.03.1.03.2.13.2.0
From 79100c41f70d1cc36be167bc4ca0a6cce1057ca4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Aug 2020 05:39:31 +0000
Subject: [PATCH 0429/1013] Bump spotbugs from 4.1.1 to 4.1.2
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.1...4.1.2)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index da9c80878..b41f1c005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.1.1
+ 4.1.24.0.42.0.0-alpha1
From 6c97dfea0bf92d29a00e510d1b6937604c196b3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Sep 2020 05:38:21 +0000
Subject: [PATCH 0430/1013] Bump commons-codec from 1.14 to 1.15
Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.14 to 1.15.
- [Release notes](https://github.com/apache/commons-codec/releases)
- [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-codec/compare/commons-codec-1.14...rel/commons-codec-1.15)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b41f1c005..9a25e4a6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,7 +179,7 @@
8.0.11.9.41.2
- 1.14
+ 1.153.2.22.12.7
From 1468586e48f8745fb28f260d5cb362c6e4681960 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Sep 2020 05:18:28 +0000
Subject: [PATCH 0431/1013] Bump maven-project-info-reports-plugin from 3.1.0
to 3.1.1
Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.0...maven-project-info-reports-plugin-3.1.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9a25e4a6b..aee35752f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
1.80.22-11.10.0
- 3.1.0
+ 3.1.13.2.13.2.03.6.0
From deea53b3ec319b1f59de8d26078855d6dc1ceafc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Sep 2020 05:47:37 +0000
Subject: [PATCH 0432/1013] Bump commons-io from 2.7 to 2.8.0
Bumps commons-io from 2.7 to 2.8.0.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index aee35752f..2f0e28cd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
1.153.2.22.1
- 2.7
+ 2.8.03.11
From b0332b917fbfa8a9564e88c02fcfd51acac44835 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Sep 2020 06:16:50 +0000
Subject: [PATCH 0433/1013] Bump gmavenplus-plugin from 1.10.0 to 1.10.1
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.10.0...1.10.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2f0e28cd0..bdb06d90b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.10.0
+ 1.10.13.1.13.2.13.2.0
From d95e2680d2a7ecb4616ae063abc31a45b2dbe8f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Sep 2020 05:41:26 +0000
Subject: [PATCH 0434/1013] Bump asm.version from 8.0.1 to 9.0
Bumps `asm.version` from 8.0.1 to 9.0.
Updates `asm` from 8.0.1 to 9.0
Updates `asm-analysis` from 8.0.1 to 9.0
Updates `asm-commons` from 8.0.1 to 9.0
Updates `asm-tree` from 8.0.1 to 9.0
Updates `asm-util` from 8.0.1 to 9.0
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bdb06d90b..3d2fa5a46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,7 +176,7 @@
5.7.0.202003110725-r
- 8.0.1
+ 9.01.9.41.21.15
From 4547ffa6496f608e49bb402bd5c6eed33d80253e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Sep 2020 05:38:55 +0000
Subject: [PATCH 0435/1013] Bump spotbugs from 4.1.2 to 4.1.3
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.2...4.1.3)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3d2fa5a46..6c7a19f0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.6.2
- 4.1.2
+ 4.1.34.0.42.0.0-alpha1
From 0d5e1821edaba0c8eeeccbb7b6a02e48f052c6c0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 26 Sep 2020 19:44:13 +0000
Subject: [PATCH 0436/1013] Bump versions-maven-plugin from 2.7 to 2.8.1
Bumps [versions-maven-plugin](https://github.com/mojohaus/versions-maven-plugin) from 2.7 to 2.8.1.
- [Release notes](https://github.com/mojohaus/versions-maven-plugin/releases)
- [Changelog](https://github.com/mojohaus/versions-maven-plugin/blob/master/ReleaseNotes.md)
- [Commits](https://github.com/mojohaus/versions-maven-plugin/compare/versions-maven-plugin-2.7...versions-maven-plugin-2.8.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6c7a19f0d..0a09d3702 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
1.11.23.9.13.6
- 2.7
+ 2.8.1false${project.build.directory}/it-src-spotbugs
From a11c8f9beb9a156d1ca323d8f119345263935ac2 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 16 Aug 2020 16:56:44 -0400
Subject: [PATCH 0437/1013] [pom] Make sure we are on spotbugs 4.1.3 fully
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6c7a19f0d..84efc9f06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.0.5-SNAPSHOT
+ 4.1.3.SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -120,7 +120,7 @@
5.6.24.1.3
- 4.0.4
+ 4.1.32.0.0-alpha11.10.8
From 77ab2e1d7443c5ec5b2cd107ba38f6adeee5382d Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 16 Aug 2020 16:57:05 -0400
Subject: [PATCH 0438/1013] [pom] Bump servlet api to 4.0.4
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 84efc9f06..a67f438e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
3.0.03.0.0-M48.0.0
- 4.0.3
+ 4.0.47.4.75.7.0.202003110725-r
From 9cceeabcd2ce49abd6b9c36e615e29c968b2a0bf Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 16 Aug 2020 16:57:17 -0400
Subject: [PATCH 0439/1013] [pom] Bump surefire to 3.0.0-M5
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a67f438e8..d2a39d294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
3.8.11.10.13.0.0
- 3.0.0-M4
+ 3.0.0-M58.0.04.0.47.4.7
From 9c03371249125a85d3a772adcbc5175887dcede8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 16 Aug 2020 16:57:44 -0400
Subject: [PATCH 0440/1013] [pom] Remove dependency check override as fixed
after base-parent 25 upgrade (on 26 now)
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index d2a39d294..e127a5a01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,9 +184,6 @@
2.12.8.03.11
-
-
- 5.3.2
From 9b44ec365a3d9b3d938f6b04e31cc56c7b42c735 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 28 Sep 2020 20:28:47 -0400
Subject: [PATCH 0441/1013] [travis] Drop openjdk14
---
.travis.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index fbeac5982..a38fbf085 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,6 @@ language: java
jdk:
- openjdk15
- - openjdk14
- openjdk11
- openjdk8
From c31ac2a9deda5aed7955b5b87cdb6a46197a4834 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 28 Sep 2020 20:28:56 -0400
Subject: [PATCH 0442/1013] [pom] Bump junit to 5.7.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6830511e6..6ba4df808 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
${project.version}
- 5.6.2
+ 5.7.04.1.34.1.32.0.0-alpha1
From ffeca0844cd3b02c6fb68a4538689438928b326f Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 28 Sep 2020 20:30:40 -0400
Subject: [PATCH 0443/1013] [pom] Bump jgit to 5.9.0.x
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6ba4df808..485ef24c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
4.0.47.4.7
- 5.7.0.202003110725-r
+ 5.9.0.202009080501-r9.0
From 1328f9c90e8434ea6b77ff9be34d2f5c78f3540a Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 28 Sep 2020 20:59:04 -0400
Subject: [PATCH 0444/1013] [pom] Fix version string - not period
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 485ef24c7..72aea1297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.3.SNAPSHOT
+ 4.1.3-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
From c69dab04621247e89a8f3e1776984636c6405976 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 28 Sep 2020 21:06:57 -0400
Subject: [PATCH 0445/1013] [pom] Added jgit support module
---
pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pom.xml b/pom.xml
index 72aea1297..3c36e1c2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -891,6 +891,11 @@
org.eclipse.jgit${jgit.version}
+
+ org.eclipse.jgit
+ org.eclipse.jgit.ssh.jsch
+ ${jgit.version}
+
From 9e3348246c1c946543d7fff454d292b9f5f03b70 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 29 Sep 2020 08:12:44 -0400
Subject: [PATCH 0446/1013] [groovy] Bump to 3.0.6 for jdk 16 support
---
pom.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3c36e1c2e..feec1b13f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
2.0.0-alpha11.10.8
- 3.0.5
+ 3.0.61.9.11.9.2
@@ -627,6 +627,13 @@
${project.reporting.outputDirectory}/gapidocstrue
+
+
+ org.codehaus.groovy
+ groovy
+ ${groovyVersion}
+
+ compileGroovy
From 085c57bd55f9eacb9b7dc6a01df96b1b36440863 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 29 Sep 2020 08:13:10 -0400
Subject: [PATCH 0447/1013] [ci] Add openjdk16
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index a38fbf085..1cb7d165d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ dist: bionic
language: java
jdk:
+ - openjdk16
- openjdk15
- openjdk11
- openjdk8
From 17aa082f1b21c9119a81ced1a0280128d9bcea51 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 30 Sep 2020 08:19:38 -0400
Subject: [PATCH 0448/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.1.3
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index feec1b13f..bd92c6708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.3-SNAPSHOT
+ 4.1.3maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.1.3GitHub Issues
From abcddd85b8403dfd9a5c961758d9dbc3aadffee8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 30 Sep 2020 08:19:39 -0400
Subject: [PATCH 0449/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index bd92c6708..b9f01b546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.3
+ 4.1.4-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.1.3
+ HEADGitHub Issues
From e9a541eb2753738251134546f197bf9a7d559634 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Oct 2020 05:50:59 +0000
Subject: [PATCH 0450/1013] Bump ant from 1.10.8 to 1.10.9
Bumps ant from 1.10.8 to 1.10.9.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b9f01b546..5d4019bfa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
4.1.32.0.0-alpha1
- 1.10.8
+ 1.10.93.0.61.9.1
From dedf1c5b5459f8e2f33c28578408712664becec8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 06:15:18 +0000
Subject: [PATCH 0451/1013] Bump gmavenplus-plugin from 1.10.1 to 1.11.0
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.10.1 to 1.11.0.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.10.1...1.11.0)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5d4019bfa..aaf01d2a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.10.1
+ 1.11.03.1.13.2.13.2.0
From 1036d313faf37c2e0d26a8c7a00a0a3e50d42635 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 19 Oct 2020 11:04:36 -0400
Subject: [PATCH 0452/1013] [pom] Bump spotbugs to 4.1.4
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index aaf01d2a2..fdf4cf305 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,8 @@
${project.version}5.7.0
- 4.1.3
- 4.1.3
+ 4.1.4
+ 4.1.42.0.0-alpha11.10.9
From b3dfcdc91065ec15a230e9a540ec4c317b32594a Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 19 Oct 2020 11:38:32 -0400
Subject: [PATCH 0453/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.1.4
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fdf4cf305..3cd6174e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.4-SNAPSHOT
+ 4.1.4maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.1.4GitHub Issues
From 7c60737846c892e05bf4fb9bb8db762fd9881038 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Mon, 19 Oct 2020 11:38:33 -0400
Subject: [PATCH 0454/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3cd6174e6..43e3acbc2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.4
+ 4.1.5-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.1.4
+ HEADGitHub Issues
From 801bf4743ec859b6c91a24b86cd90bfb0d5b4be7 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 25 Nov 2020 22:24:14 -0500
Subject: [PATCH 0455/1013] [actions] Add github actions ci builds
---
.github/workflows/ci.yaml | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 .github/workflows/ci.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 000000000..3712a9dd1
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,23 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+ test:
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ os: [ubuntu-latest, macOS-latest, windows-latest]
+ java: [8, 11, 15, 16-ea]
+ fail-fast: false
+ max-parallel: 4
+ name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: ${{ matrix.java }}
+ - name: Test with Maven
+ run: mvn test -B
From e8f21891465995b988cd0a5b70653e6fee430119 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Thu, 26 Nov 2020 00:47:34 -0500
Subject: [PATCH 0456/1013] [travis] Revert change to condition check on master
This appears to not be regex as discovered by eclipse but rather doesn't work if not set this way at all.
---
.travis.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1cb7d165d..1c77b140c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ deploy:
repo: spotbugs/spotbugs-maven-plugin
branch: spotbugs
jdk: openjdk11
- condition: $TRAVIS_COMMIT_MESSAGE !~ ^\[maven-release-plugin\]*
+ condition: $TRAVIS_COMMIT_MESSAGE != ^\[maven-release-plugin\]*
- provider: pages
skip_cleanup: true
@@ -37,4 +37,4 @@ deploy:
repo: spotbugs/spotbugs-maven-plugin
branch: spotbugs
jdk: openjdk11
- condition: $TRAVIS_COMMIT_MESSAGE !~ ^\[maven-release-plugin\]*
+ condition: $TRAVIS_COMMIT_MESSAGE != ^\[maven-release-plugin\]*
From 3237da18f4214d414a09abe7d1005018baa5691a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Nov 2020 06:15:36 +0000
Subject: [PATCH 0457/1013] Bump spotbugs from 4.1.4 to 4.2.0
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.1.4 to 4.2.0.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.1.4...4.2.0)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 43e3acbc2..92abc3157 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
${project.version}5.7.0
- 4.1.4
+ 4.2.04.1.42.0.0-alpha1
From 5e8c21467698099bd8fc5b75ca1a8f9b3fe3019e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 05:58:10 +0000
Subject: [PATCH 0458/1013] Bump gmavenplus-plugin from 1.11.0 to 1.11.1
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.11.0 to 1.11.1.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.11.0...1.11.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 92abc3157..bbc3a7051 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.11.0
+ 1.11.13.1.13.2.13.2.0
From dcc7ec4c16b4ce5c3a37a9332063b2b46b8390fb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Dec 2020 05:41:53 +0000
Subject: [PATCH 0459/1013] Bump groovyVersion from 3.0.6 to 3.0.7
Bumps `groovyVersion` from 3.0.6 to 3.0.7.
Updates `groovy` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.6 to 3.0.7
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bbc3a7051..0c07c7b53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
2.0.0-alpha11.10.9
- 3.0.6
+ 3.0.71.9.11.9.2
From 1512b8c38199359651ff208f67116427f100798a Mon Sep 17 00:00:00 2001
From: Alberto Otero Lorenzo
Date: Tue, 15 Dec 2020 15:17:29 +0100
Subject: [PATCH 0460/1013] Add IT test to check excludeFiltersFile
duplications on multi-module projects
---
.../invoker.properties | 4 ++
.../check-multi-filter-dups/module1/pom.xml | 38 ++++++++++++
.../check-multi-filter-dups/module2/pom.xml | 38 ++++++++++++
src/it/check-multi-filter-dups/pom.xml | 60 +++++++++++++++++++
.../main/config/spotbugs-exclude-filters.xml | 6 ++
src/it/check-multi-filter-dups/verify.groovy | 29 +++++++++
6 files changed, 175 insertions(+)
create mode 100644 src/it/check-multi-filter-dups/invoker.properties
create mode 100644 src/it/check-multi-filter-dups/module1/pom.xml
create mode 100644 src/it/check-multi-filter-dups/module2/pom.xml
create mode 100644 src/it/check-multi-filter-dups/pom.xml
create mode 100644 src/it/check-multi-filter-dups/src/main/config/spotbugs-exclude-filters.xml
create mode 100644 src/it/check-multi-filter-dups/verify.groovy
diff --git a/src/it/check-multi-filter-dups/invoker.properties b/src/it/check-multi-filter-dups/invoker.properties
new file mode 100644
index 000000000..d5da9063b
--- /dev/null
+++ b/src/it/check-multi-filter-dups/invoker.properties
@@ -0,0 +1,4 @@
+invoker.goals = clean compile spotbugs:check
+
+# The expected result of the build, possible values are "success" (default) and "failure"
+invoker.buildResult = success
diff --git a/src/it/check-multi-filter-dups/module1/pom.xml b/src/it/check-multi-filter-dups/module1/pom.xml
new file mode 100644
index 000000000..9c30b2e3b
--- /dev/null
+++ b/src/it/check-multi-filter-dups/module1/pom.xml
@@ -0,0 +1,38 @@
+
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ check-multi-parent-relative-path
+ testing
+ ..
+
+ module1
+ module1
+ jar
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+
+
+
diff --git a/src/it/check-multi-filter-dups/module2/pom.xml b/src/it/check-multi-filter-dups/module2/pom.xml
new file mode 100644
index 000000000..b3117c81f
--- /dev/null
+++ b/src/it/check-multi-filter-dups/module2/pom.xml
@@ -0,0 +1,38 @@
+
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ check-multi-parent-relative-path
+ testing
+ ..
+
+ module2
+ module2
+ jar
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+
+
+
diff --git a/src/it/check-multi-filter-dups/pom.xml b/src/it/check-multi-filter-dups/pom.xml
new file mode 100644
index 000000000..dbef936e3
--- /dev/null
+++ b/src/it/check-multi-filter-dups/pom.xml
@@ -0,0 +1,60 @@
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ common
+ testing
+ ../common.xml
+
+ check-multi-parent-relative-path
+ check-multi-parent-relative-path
+ pom
+
+ module1
+ module2
+
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+ false
+ ${project.parent.relativePath}/src/main/config/spotbugs-exclude-filters.xml
+
+
+
+ spotbugs
+ prepare-package
+
+ check
+
+
+
+
+
+
+
+
+ ..
+
+
+
+
diff --git a/src/it/check-multi-filter-dups/src/main/config/spotbugs-exclude-filters.xml b/src/it/check-multi-filter-dups/src/main/config/spotbugs-exclude-filters.xml
new file mode 100644
index 000000000..b9b77c524
--- /dev/null
+++ b/src/it/check-multi-filter-dups/src/main/config/spotbugs-exclude-filters.xml
@@ -0,0 +1,6 @@
+
+
+
\ No newline at end of file
diff --git a/src/it/check-multi-filter-dups/verify.groovy b/src/it/check-multi-filter-dups/verify.groovy
new file mode 100644
index 000000000..021a82986
--- /dev/null
+++ b/src/it/check-multi-filter-dups/verify.groovy
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+// check module 1
+
+File spotbugXmlInModule = new File(basedir, "module1/src/main/config/spotbugs-exclude-filters.xml")
+assert !spotbugXmlInModule.exists()
+
+
+// check module 2
+
+spotbugXmlInModule = new File(basedir, "module2/src/main/config/spotbugs-exclude-filters.xml")
+assert !spotbugXmlInModule.exists()
+
From 86139c1a48ecac3ba80533bdf9802b3a98cca699 Mon Sep 17 00:00:00 2001
From: Alberto Otero Lorenzo
Date: Tue, 15 Dec 2020 16:31:07 +0100
Subject: [PATCH 0461/1013] Remove playground lines
---
src/it/check-multi-filter-dups/pom.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/it/check-multi-filter-dups/pom.xml b/src/it/check-multi-filter-dups/pom.xml
index dbef936e3..ff5d206d4 100644
--- a/src/it/check-multi-filter-dups/pom.xml
+++ b/src/it/check-multi-filter-dups/pom.xml
@@ -51,10 +51,6 @@
-
-
- ..
-
From 125ac2d27514b41c14182ca7d1b3357e3209f77d Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 17:56:10 -0500
Subject: [PATCH 0462/1013] [actions] Add sonar / coverity
---
.github/workflows/coverity.yaml | 32 ++++++++++++++++++++++++++++++++
.github/workflows/sonar.yaml | 25 +++++++++++++++++++++++++
2 files changed, 57 insertions(+)
create mode 100644 .github/workflows/coverity.yaml
create mode 100644 .github/workflows/sonar.yaml
diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
new file mode 100644
index 000000000..8d7aa13a2
--- /dev/null
+++ b/.github/workflows/coverity.yaml
@@ -0,0 +1,32 @@
+name: Coverity
+
+on:
+ push:
+ branches:
+ - coverity_scan
+
+jobs:
+ build:
+ if: github.repository_owner == 'spotbugs'
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Analyze with Coverity
+ run: |
+ wget -q https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_TOKEN&project=spotbugs%2Fspotbugs-maven-plugin" -O coverity_tool.tgz
+ tar -xf coverity_tool.tgz
+ ./cov-analysis-linux64-*/bin/cov-build --dir cov-int ./mvnw -B -DskipTests=true verify
+ tar czvf spotbugs-maven-plugin.tgz cov-int
+ curl --form token=$COVERITY_TOKEN \
+ --form email=$EMAIL \
+ --form file=@spotbugs-maven-plugin.tgz \
+ --form version="spotbugs-maven-plugin/coverity_scan" \
+ --form description="Spotbugs Maven Plugin Coverity Scan" \
+ https://scan.coverity.com/builds?project=spotbugs%2Fspotbugs-maven-plugin
+ env:
+ COVERITY_TOKEN: ${{ secrets.COVERITY_TOKEN }}
+ EMAIL: ${{ secrets.EMAIL }}
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
new file mode 100644
index 000000000..786cd5c2f
--- /dev/null
+++ b/.github/workflows/sonar.yaml
@@ -0,0 +1,25 @@
+name: SonarCloud
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ build:
+ if: github.repository_owner == 'spotbugs'
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ # Disabling shallow clone is recommended for improving relevancy of reporting
+ fetch-depth: 0
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Analyze with SonarCloud
+ run: ./mvnw verify sonar:sonar -B -D"sonar.projectKey=spotbugs_spotbugs-maven-plugin" -D"sonar.organization=spotbugs" -D"sonar.host.url=https://sonarcloud.io" -D"sonar.login=$SONAR_TOKEN"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
From 7f5e0622a6b588199f63ee6927c02f3221157d83 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 17:58:03 -0500
Subject: [PATCH 0463/1013] [pom] Bump to spotbugs 4.2.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0c07c7b53..3b7ba7c0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.1.5-SNAPSHOT
+ 4.2.0-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -120,7 +120,7 @@
5.7.04.2.0
- 4.1.4
+ 4.2.02.0.0-alpha11.10.9
From 67a1a7f90b663ce948705c44a380a18cc68c948c Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:34:57 -0500
Subject: [PATCH 0464/1013] [actions] Run on PRs as well / drop jdk 16 as error
prone doesn't support yet
---
.github/workflows/ci.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3712a9dd1..7f8b9a105 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
name: Java CI
-on: [push]
+on: [push, pull_request]
jobs:
test:
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
- java: [8, 11, 15, 16-ea]
+ java: [8, 11, 15]
fail-fast: false
max-parallel: 4
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -20,4 +20,4 @@ jobs:
with:
java-version: ${{ matrix.java }}
- name: Test with Maven
- run: mvn test -B
+ run: ./mvnw test -B
From c8948d4d6d841bb0eaec6d07609a60c3960c3164 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:35:54 -0500
Subject: [PATCH 0465/1013] [actions] Add initial coverals but note it won't
work yet nor set to pull tests as we need (ie integration tests)
---
.github/workflows/coveralls.yaml | 41 ++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
create mode 100644 .github/workflows/coveralls.yaml
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
new file mode 100644
index 000000000..931999a91
--- /dev/null
+++ b/.github/workflows/coveralls.yaml
@@ -0,0 +1,41 @@
+#
+# Copyright 2015-2020 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: Coveralls
+
+on: [push, pull_request]
+
+jobs:
+ build:
+ if: github.repository_owner == 'spotbugs'
+ runs-on: windows-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Report Coverage to Coveralls for Pull Requests
+ if: github.event_name == 'pull_request'
+ run: ./mvnw test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ PR_NUMBER: ${{ github.event.number }}
+ - name: Report Coverage to Coveralls for General Push
+ if: github.event_name == 'push'
+ run: ./mvnw test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From 3606a3d0f4d11dfb42d425f5080b25673d1b10d0 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:36:13 -0500
Subject: [PATCH 0466/1013] [actions] Add initial drop in for site distribution
- will get working later
---
.github/workflows/site.yaml | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 .github/workflows/site.yaml
diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
new file mode 100644
index 000000000..23961d6c7
--- /dev/null
+++ b/.github/workflows/site.yaml
@@ -0,0 +1,33 @@
+name: Site
+
+on:
+ push:
+ branches:
+ - site
+
+jobs:
+ build:
+ if: github.repository_owner == 'spotbugs' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - uses: webfactory/ssh-agent@master
+ with:
+ ssh-private-key: ${{ secrets.DEPLOY_KEY }}
+ - name: Build site
+ run: ./mvnw site site:stage -DskipTests -B
+ env:
+ CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ - name: Deploy Site to gh-pages
+ uses: JamesIves/github-pages-deploy-action@3.7.1
+ with:
+ SSH: true
+ BRANCH: gh-pages
+ FOLDER: target/staging
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From 502932627dfe06d0a1e90c4028d4025ce6d3ed80 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:36:25 -0500
Subject: [PATCH 0467/1013] [actions] Enable sonatype
---
.github/workflows/sonatype.yaml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 .github/workflows/sonatype.yaml
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
new file mode 100644
index 000000000..514e43771
--- /dev/null
+++ b/.github/workflows/sonatype.yaml
@@ -0,0 +1,22 @@
+name: Sonatype
+
+on:
+ push:
+ branches:
+ - master
+
+jobs:
+ build:
+ if: github.repository_owner == 'spotbugs' && ! contains(toJSON(github.event.head_commit.message), '[maven-release-plugin]')
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Deploy to Sonatype
+ run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml
+ env:
+ CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+ CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
From bd743f0862b8ecbda1ac6457f9845db83db14c46 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:38:56 -0500
Subject: [PATCH 0468/1013] [travis] Drop jdk 16, 15, and 8 as these are done
in actions now
Will eventually drop travis entirely once all pieces are up to date.
---
.travis.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1c77b140c..ad13a07b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,7 @@ dist: bionic
language: java
jdk:
- - openjdk16
- - openjdk15
- openjdk11
- - openjdk8
env:
global:
From ad6fb67c5f4d25de6dca4a9d691d08a4066e1774 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 19:53:09 -0500
Subject: [PATCH 0469/1013] [actions] Change the default branch for
sonar/sonatype
---
.github/workflows/sonar.yaml | 2 +-
.github/workflows/sonatype.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 786cd5c2f..c5a4743d5 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -3,7 +3,7 @@ name: SonarCloud
on:
push:
branches:
- - master
+ - spotbugs
jobs:
build:
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index 514e43771..d30af7834 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -3,7 +3,7 @@ name: Sonatype
on:
push:
branches:
- - master
+ - spotbugs
jobs:
build:
From 4d8f3e78b9f9c9ba0507c0d51bec3b8f0e88794f Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 15 Dec 2020 20:48:14 -0500
Subject: [PATCH 0470/1013] [maven] Add settings so we can do various actions
---
.mvn/extensions.xml | 8 ++++++++
.mvn/settings.xml | 19 +++++++++++++++++++
2 files changed, 27 insertions(+)
create mode 100644 .mvn/extensions.xml
create mode 100644 .mvn/settings.xml
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..1c87ce310
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+
+
+
+ fr.jcgay.maven
+ maven-profiler
+ 3.0
+
+
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
new file mode 100644
index 000000000..5b91cb639
--- /dev/null
+++ b/.mvn/settings.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ ossrh
+ ${env.CI_DEPLOY_USERNAME}
+ ${env.CI_DEPLOY_PASSWORD}
+
+
+ gh-pages
+
+
+ github
+ ${env.CI_DEPLOY_USERNAME}
+ ${env.GITHUB_TOKEN}
+
+
+
From 4aace5c80f2ea74e4e1812e76bfdc88bd05798cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 05:38:44 +0000
Subject: [PATCH 0471/1013] Bump jgit.version from 5.9.0.202009080501-r to
5.10.0.202012080955-r
Bumps `jgit.version` from 5.9.0.202009080501-r to 5.10.0.202012080955-r.
Updates `org.eclipse.jgit` from 5.9.0.202009080501-r to 5.10.0.202012080955-r
Updates `org.eclipse.jgit.ssh.jsch` from 5.9.0.202009080501-r to 5.10.0.202012080955-r
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3b7ba7c0f..97a847bb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
4.0.47.4.7
- 5.9.0.202009080501-r
+ 5.10.0.202012080955-r9.0
From cd6c5d3388212bec63857aaf9bf331e034724c22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 05:38:57 +0000
Subject: [PATCH 0472/1013] Bump gmavenplus-plugin from 1.11.1 to 1.12.0
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.11.1 to 1.12.0.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.11.1...1.12.0)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3b7ba7c0f..942b8e26d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.11.1
+ 1.12.03.1.13.2.13.2.0
From b81c32d6f5fd3d1e93efaaef251f3b2f16be9527 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Dec 2020 06:17:03 +0000
Subject: [PATCH 0473/1013] Bump maven-artifact-transfer from 0.12.0 to 0.13.1
Bumps [maven-artifact-transfer](https://github.com/apache/maven-artifact-transfer) from 0.12.0 to 0.13.1.
- [Release notes](https://github.com/apache/maven-artifact-transfer/releases)
- [Commits](https://github.com/apache/maven-artifact-transfer/compare/maven-artifact-transfer-0.12.0...maven-artifact-transfer-0.13.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 12bfe0609..56a3dd992 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,7 +130,7 @@
1.9.23.2.5
- 0.12.0
+ 0.13.13.03.0.03.5.2
From c1a491373c8e099f6bc7ff05727e9d06044ed83f Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Thu, 31 Dec 2020 13:07:24 -0500
Subject: [PATCH 0474/1013] [actions] Move integration tests to github actions
---
.github/workflows/it.yaml | 37 +++++++++++++++++++++++++++++++++++++
.travis.yml | 3 ---
2 files changed, 37 insertions(+), 3 deletions(-)
create mode 100644 .github/workflows/it.yaml
diff --git a/.github/workflows/it.yaml b/.github/workflows/it.yaml
new file mode 100644
index 000000000..520976090
--- /dev/null
+++ b/.github/workflows/it.yaml
@@ -0,0 +1,37 @@
+#
+# Copyright 2011-2020 the original author or authors.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# You may obtain a copy of the License at
+#
+# https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+
+name: Java Integration Tests
+
+on: [push, pull_request]
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ name: Integration Tests
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Set up JDK
+ uses: actions/setup-java@v1
+ with:
+ java-version: 11
+ - name: Build Setup
+ run: ./mvnw clean install
+ - name: Integration Test with Maven
+ run: ./mvnw -DtestSrc=remote -Prun-its clean install -Dinvoker.parallelThreads=4
diff --git a/.travis.yml b/.travis.yml
index ad13a07b0..769f0c803 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,6 @@ env:
# GITHUB_TOKEN value to push changes to GitHub; Currently it is used to update gh-pages.
- secure: "KqPuq9TiiqdOUfGq3k+XYObNjV8FxbgJeqSWK0pcWFFs5w5c4vcGmrfUSSSqNa/JJkKOBWQ6S3tJP7CRxx0uow5BvU4ZQAZLFt6VjzcUZFKGTl5soMTF2gQdyAAcwUnRX2gQKt0doO8Fid6xzfsn1KdTIWXmeqMrcTvC+d7EhxU="
-script:
- - ./mvnw verify -B -P run-its -DtestSrc=remote -Dinvoker.parallelThreads=4
-
deploy:
- provider: script
skip_cleanup: true
From ac9c5747e5c99fcae2fb0e79c6347d3efb49a389 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Jan 2021 05:57:28 +0000
Subject: [PATCH 0475/1013] Bump base-parent from 26 to 27
Bumps [base-parent](https://github.com/hazendaz/base-parent) from 26 to 27.
- [Release notes](https://github.com/hazendaz/base-parent/releases)
- [Commits](https://github.com/hazendaz/base-parent/commits)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 56a3dd992..0f05aa0c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 26
+ 27
From d8a1d0e7872a582a97bb2f7d753790f7bf5f97da Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 19 Jun 2020 19:50:21 -0400
Subject: [PATCH 0476/1013] [ci] Update deprecated toInteger to simple cast int
---
.../org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
index 0b8aaf635..ed530967f 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotbugsReportGenerator.groovy
@@ -448,7 +448,7 @@ class SpotbugsReportGenerator implements SpotBugsInfo {
// priority
sink.tableCell()
- sink.text(spotbugsPriority[priority.toInteger()])
+ sink.text(spotbugsPriority[priority as Integer])
sink.tableCell_()
sink.tableRow_()
From 86c4f910fbe6e3b08d542962308ed5ec38208484 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:13:54 -0500
Subject: [PATCH 0477/1013] [pom] Use newer site generation
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f05aa0c0..27a9863f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,8 +110,8 @@
https://oss.sonatype.org/content/repositories/snapshots
- gh-pages
- github:ssh://spotbugs.github.io/spotbugs-maven-plugin/
+ gh-pages-scm
+ scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.git
From e9d7bfa14b952d42fd1d4da50b7bc61f0289fcb0 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:22:52 -0500
Subject: [PATCH 0478/1013] [ci] Drop travis-ci / add ignore on keys
---
.gitignore | 1 +
.travis.yml | 34 ----------------------------------
2 files changed, 1 insertion(+), 34 deletions(-)
delete mode 100644 .travis.yml
diff --git a/.gitignore b/.gitignore
index f3e2d95f2..0a6ebbc0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.classpath
+.github/keys
.project
.settings
target/
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 769f0c803..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# See https://docs.travis-ci.com/user/reference/overview/
-dist: bionic
-
-language: java
-
-jdk:
- - openjdk11
-
-env:
- global:
- # GITHUB_TOKEN value to push changes to GitHub; Currently it is used to update gh-pages.
- - secure: "KqPuq9TiiqdOUfGq3k+XYObNjV8FxbgJeqSWK0pcWFFs5w5c4vcGmrfUSSSqNa/JJkKOBWQ6S3tJP7CRxx0uow5BvU4ZQAZLFt6VjzcUZFKGTl5soMTF2gQdyAAcwUnRX2gQKt0doO8Fid6xzfsn1KdTIWXmeqMrcTvC+d7EhxU="
-
-deploy:
- - provider: script
- skip_cleanup: true
- script: ./mvnw site -B -Ddownloader.tls.protocols=TLSv1.2,TLSv1.3
- email: jeremylandis@hotmail.com
- on:
- repo: spotbugs/spotbugs-maven-plugin
- branch: spotbugs
- jdk: openjdk11
- condition: $TRAVIS_COMMIT_MESSAGE != ^\[maven-release-plugin\]*
-
- - provider: pages
- skip_cleanup: true
- github_token: $GITHUB_TOKEN
- local_dir: target/site
- email: skypencil+spotbugs-bot@gmail.com
- on:
- repo: spotbugs/spotbugs-maven-plugin
- branch: spotbugs
- jdk: openjdk11
- condition: $TRAVIS_COMMIT_MESSAGE != ^\[maven-release-plugin\]*
From 7d6cbd8869500636c9ed9693fbd15ca29ea2bf1b Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:31:08 -0500
Subject: [PATCH 0479/1013] [pom] Bump gmavenplus to 1.12.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 27a9863f8..7ac53e61b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
3.0.01.80.22-1
- 1.12.0
+ 1.12.13.1.13.2.13.2.0
From b2f85c64e5e618b3124b330f05e41a5149d9187b Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:49:51 -0500
Subject: [PATCH 0480/1013] [pom] Set the source directory for some plugins
that don't directly handle groovy
---
pom.xml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pom.xml b/pom.xml
index 7ac53e61b..1c43486b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
+ ${project.basedir}/src/main/groovy
+
${project.version}5.7.0
From ff95b2b0617bcaea8e6f5cc1a0f1f3ae1c603833 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:55:10 -0500
Subject: [PATCH 0481/1013] [maven] Setup for releasing 'site' from local
during release cycle with new pages end point
---
.mvn/settings.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.mvn/settings.xml b/.mvn/settings.xml
index 5b91cb639..d192f1b36 100644
--- a/.mvn/settings.xml
+++ b/.mvn/settings.xml
@@ -8,7 +8,11 @@
${env.CI_DEPLOY_PASSWORD}
- gh-pages
+ gh-pages-scm
+
+ branch
+ gh-pages
+ github
From f559ece76d52144f6afbf880566938724b7f5a95 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 14:57:56 -0500
Subject: [PATCH 0482/1013] [actions] Turn off coveralls as this project
doesn't yet have in-line tests
just integration tests, need to figure that out still for coveralls so disable so this stops running for now.
---
.github/workflows/coveralls.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 931999a91..53a8bee3d 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -20,7 +20,7 @@ on: [push, pull_request]
jobs:
build:
- if: github.repository_owner == 'spotbugs'
+ if: github.repository_owner == 'spotbugs-OFF'
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
From e49c19090662ab775848c7c9fbe42c4b7b231893 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 17:00:56 -0500
Subject: [PATCH 0483/1013] Revert "Merge pull request #238 from
tkalmar/spotbugs"
This reverts commit 2e711898660b8fd3486680fbb72ed849ae76a3a5, reversing
changes made to bf0fbab1e844ba5cb64887e992f0327813844b4a.
---
.../org/codehaus/mojo/spotbugs/ResourceHelper.groovy | 11 +++++------
.../org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy | 2 ++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
index 857b23eb6..fcedf6414 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
@@ -25,8 +25,6 @@ import org.codehaus.plexus.resource.loader.FileResourceLoader
import org.codehaus.plexus.resource.ResourceManager
import org.codehaus.plexus.util.FileUtils
-import java.nio.file.Paths
-
final class ResourceHelper {
Log log
@@ -55,11 +53,12 @@ final class ResourceHelper {
String location = null
String artifact = resource
- def file = new File(resource)
+ if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
+ artifact = resource.substring(resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH) + 1)
+ }
- if (file.exists()) {
- artifact = file.getName()
- location = file.getAbsolutePath()
+ if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
+ location = resource.substring(0, resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH))
}
// replace all occurrences of the following characters: ? : & =
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index 3c40ceccd..d66a7fdc8 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -77,6 +77,8 @@ interface SpotBugsInfo {
static final String COMMA = ","
+ static final String FORWARD_SLASH = '/'
+
/**
* The character to separate URL tokens.
*
From 66fe09c24c70271ba62a59ed8f08f2a39be258da Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 17:28:40 -0500
Subject: [PATCH 0484/1013] [windows] Add fix to support processing properly on
windows by not ending up with long c_ path to jar files
Fix on #238 only resulted in cleaning up unnecessary copies but made other processing worse. As a result, #238 is being reverted. This patch is to make windows usage behave like linux usage. It still expected to copy the jar files (even if unnecessary) but not nexted into a deep folder structure, rather just the artifact name. The original logic did not handle windows at all. It now does but is still not a great solution.
---
.../org/codehaus/mojo/spotbugs/ResourceHelper.groovy | 10 ++++++++++
.../org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy | 2 ++
2 files changed, 12 insertions(+)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
index fcedf6414..fa9b96fcc 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/ResourceHelper.groovy
@@ -53,6 +53,7 @@ final class ResourceHelper {
String location = null
String artifact = resource
+ // Linux Checks
if (resource.indexOf(SpotBugsInfo.FORWARD_SLASH) != -1) {
artifact = resource.substring(resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH) + 1)
}
@@ -61,6 +62,15 @@ final class ResourceHelper {
location = resource.substring(0, resource.lastIndexOf(SpotBugsInfo.FORWARD_SLASH))
}
+ // Windows Checks
+ if (resource.indexOf(SpotBugsInfo.BACKWARD_SLASH) != -1) {
+ artifact = resource.substring(resource.lastIndexOf(SpotBugsInfo.BACKWARD_SLASH) + 1)
+ }
+
+ if (resource.indexOf(SpotBugsInfo.BACKWARD_SLASH) != -1) {
+ location = resource.substring(0, resource.lastIndexOf(SpotBugsInfo.BACKWARD_SLASH))
+ }
+
// replace all occurrences of the following characters: ? : & =
location = location?.replaceAll("[\\?\\:\\&\\=\\%]", "_")
artifact = artifact?.replaceAll("[\\?\\:\\&\\=\\%]", "_")
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
index d66a7fdc8..a4ff7b221 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsInfo.groovy
@@ -79,6 +79,8 @@ interface SpotBugsInfo {
static final String FORWARD_SLASH = '/'
+ static final String BACKWARD_SLASH = '\\'
+
/**
* The character to separate URL tokens.
*
From d5ee2c1ecfc2b58940146437c7ea5e03b786f673 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 18:04:56 -0500
Subject: [PATCH 0485/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.2.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1c43486b1..51c6b772a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.0-SNAPSHOT
+ 4.2.0maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.2.0GitHub Issues
From 6097f032bdfb95e4a388d82c583a840819d3d908 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 18:04:57 -0500
Subject: [PATCH 0486/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51c6b772a..b43e61b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.0
+ 4.2.1-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.2.0
+ HEADGitHub Issues
From 84779435b4441e53907d4b7bb63754eecb9cd3be Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 3 Jan 2021 18:15:16 -0500
Subject: [PATCH 0487/1013] [ci] Switch out badge from travis to github actions
and add in integration tests
---
README.md | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 5122e9a36..59742bde4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# Spotbugs Maven Plugin
-[![Build Status](https://travis-ci.org/spotbugs/spotbugs-maven-plugin.svg?branch=spotbugs)](https://travis-ci.org/spotbugs/spotbugs-maven-plugin)
+[![Java CI](https://github.com/spotbugs/spotbugs-maven-plugin/workflows/Java%20CI/badge.svg)](https://github.com/spotbugs/spotbugs-maven-plugin/actions?query=workflow%3A%22Java+CI%22)
+[![Java Integration Tests](https://github.com/spotbugs/spotbugs-maven-plugin/workflows/Java%20Integration%20Tests/badge.svg)](https://github.com/spotbugs/spotbugs-maven-plugin/actions?query=workflow%3A%22Java+Integration+Tests%22)
[![Maven central](https://maven-badges.herokuapp.com/maven-central/com.github.spotbugs/spotbugs-maven-plugin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.github.spotbugs/spotbugs-maven-plugin)
[![Apache 2](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
From b498d5ca95427d3c153c53adf6ece77c5396e69b Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Tue, 5 Jan 2021 20:41:19 -0500
Subject: [PATCH 0488/1013] [site] Fix site on github actions
Not sure exactly how it gets the folder name other than that is part of scm piece site was moved onto for deployment. This sort of made sense it has use of a super pom and the site gets messed up trying to push back to a parent. I would have thought name would work out differently then
---
.github/workflows/site.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
index 23961d6c7..a9309bfeb 100644
--- a/.github/workflows/site.yaml
+++ b/.github/workflows/site.yaml
@@ -28,6 +28,6 @@ jobs:
with:
SSH: true
BRANCH: gh-pages
- FOLDER: target/staging
+ FOLDER: spotbugs/spotbugs-maven-plugin.git
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From f20be3f2895e1fb00bccb8eb1edb59cf38c01803 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Feb 2021 05:28:20 +0000
Subject: [PATCH 0489/1013] Bump spotbugs from 4.2.0 to 4.2.1
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.0...4.2.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b43e61b94..5d3e29918 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.0
- 4.2.0
+ 4.2.14.2.02.0.0-alpha1
From 88329260615029fbd51e98e279c2580bd72c8928 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 05:43:24 +0000
Subject: [PATCH 0490/1013] Bump asm.version from 9.0 to 9.1
Bumps `asm.version` from 9.0 to 9.1.
Updates `asm` from 9.0 to 9.1
Updates `asm-analysis` from 9.0 to 9.1
Updates `asm-commons` from 9.0 to 9.1
Updates `asm-tree` from 9.0 to 9.1
Updates `asm-util` from 9.0 to 9.1
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5d3e29918..a39973e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
5.10.0.202012080955-r
- 9.0
+ 9.11.9.41.21.15
From d689621742517ff4b3dd3a22c4e64b74ed74ef7a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Feb 2021 05:47:35 +0000
Subject: [PATCH 0491/1013] Bump maven-invoker-plugin from 3.2.1 to 3.2.2
Bumps [maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/apache/maven-invoker-plugin/releases)
- [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.2.1...maven-invoker-plugin-3.2.2)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a39973e43..7c2985037 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
0.22-11.12.13.1.1
- 3.2.1
+ 3.2.23.2.03.6.01.11.2
From 051b6cb9306689cc45b956bcea6eee17f7c07060 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Mar 2021 05:10:08 +0000
Subject: [PATCH 0492/1013] Bump commons-lang3 from 3.11 to 3.12.0
Bumps commons-lang3 from 3.11 to 3.12.0.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7c2985037..c41f03848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@
3.2.22.12.8.0
- 3.11
+ 3.12.0
From 25f71b8e7cf6bad46dafe7190c63f52637306a4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Mar 2021 05:11:34 +0000
Subject: [PATCH 0493/1013] Bump spotbugs from 4.2.1 to 4.2.2
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.1...4.2.2)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c41f03848..dd1b9ccbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.0
- 4.2.1
+ 4.2.24.2.02.0.0-alpha1
From e37eb512a557e350eeee2458017ef87e6d14e508 Mon Sep 17 00:00:00 2001
From: cindyoliver-se
Date: Fri, 19 Mar 2021 12:42:29 +0800
Subject: [PATCH 0494/1013] fix issue306
---
src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 6b740b809..d5adea5c4 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -1062,7 +1062,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
if (debug || trace) {
- sysproperty(key: "spotbugs.debug", value: true)
+ sysproperty(key: "findbugs.debug", value: true)
}
classpath() {
From cfb8fdb5131475aff9e1d8a4e2ba0551a7e48ded Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 21 Mar 2021 22:52:53 +0000
Subject: [PATCH 0495/1013] Bump jgit.version from 5.10.0.202012080955-r to
5.11.0.202103091610-r
Bumps `jgit.version` from 5.10.0.202012080955-r to 5.11.0.202103091610-r.
Updates `org.eclipse.jgit` from 5.10.0.202012080955-r to 5.11.0.202103091610-r
Updates `org.eclipse.jgit.ssh.jsch` from 5.10.0.202012080955-r to 5.11.0.202103091610-r
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index dd1b9ccbd..a584c74dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
4.0.47.4.7
- 5.10.0.202012080955-r
+ 5.11.0.202103091610-r9.1
From 0f6288db3a82033505a9f9ee27973d36bb8bb991 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 21 Mar 2021 23:16:48 -0400
Subject: [PATCH 0496/1013] [pom] Add some additional notes to revisit getting
off legacy support when spotbugs gets to 4.3
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a584c74dd..335f5cfe4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
0.13.13.03.0.0
- 3.5.2
+ 3.5.22.1.01.1.0
@@ -151,7 +151,7 @@
3.6.01.11.23.9.1
- 3.6
+ 3.62.8.1false
From 9609a1af6e928ce6d5cb2d263d47e64850e78c49 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 21 Mar 2021 23:17:00 -0400
Subject: [PATCH 0497/1013] [pom] Bump spotbugs to 4.2.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 335f5cfe4..791e19503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
5.7.04.2.2
- 4.2.0
+ 4.2.22.0.0-alpha11.10.9
From bef37f63d2d1ca9834e9a91e6b011c0ae2ac80c8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 21 Mar 2021 23:49:59 -0400
Subject: [PATCH 0498/1013] [maven-release-plugin] prepare release 4.2.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 791e19503..74bb21744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.1-SNAPSHOT
+ 4.2.2maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ 4.2.2GitHub Issues
From 063974565e40d2829b6a80db7c6c6547b63d483e Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 21 Mar 2021 23:50:00 -0400
Subject: [PATCH 0499/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 74bb21744..063e6d693 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.2
+ 4.2.3-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- 4.2.2
+ HEADGitHub Issues
From a39ea77c9f14edca7740d9142c36c738bf263cac Mon Sep 17 00:00:00 2001
From: sullis
Date: Sun, 28 Mar 2021 09:59:05 -0700
Subject: [PATCH 0500/1013] ci: add JDK 16
---
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 7f8b9a105..ebffca208 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
- java: [8, 11, 15]
+ java: [8, 11, 15, 16]
fail-fast: false
max-parallel: 4
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
From b66fa99ae4f0f2df8c97105b735d3fbafa23dff6 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 11 Apr 2021 14:22:38 -0400
Subject: [PATCH 0501/1013] [pom] Bump base-parent to 28
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 063e6d693..f90d1c5df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 27
+ 28
From 15342e83c94acc8cd8691725d83a2b00ff94d505 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 11 Apr 2021 14:23:25 -0400
Subject: [PATCH 0502/1013] [actions] Drop jdk 15
---
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ebffca208..c09ea2d7d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
- java: [8, 11, 15, 16]
+ java: [8, 11, 16]
fail-fast: false
max-parallel: 4
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
From adbb54a14cdb7a7a83f6ae451fb3b15afa7c2fa3 Mon Sep 17 00:00:00 2001
From: sullis
Date: Sun, 11 Apr 2021 14:01:06 -0700
Subject: [PATCH 0503/1013] [actions] setup-java v2
---
.github/workflows/ci.yaml | 3 ++-
.github/workflows/coveralls.yaml | 3 ++-
.github/workflows/coverity.yaml | 3 ++-
.github/workflows/it.yaml | 3 ++-
.github/workflows/site.yaml | 3 ++-
.github/workflows/sonar.yaml | 3 ++-
.github/workflows/sonatype.yaml | 3 ++-
7 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c09ea2d7d..736e89164 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -16,8 +16,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: ${{ matrix.java }}
+ distribution: 'zulu'
- name: Test with Maven
run: ./mvnw test -B
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 53a8bee3d..0e3d5d44b 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -25,9 +25,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- name: Report Coverage to Coveralls for Pull Requests
if: github.event_name == 'pull_request'
run: ./mvnw test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER
diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
index 8d7aa13a2..fb4f575d8 100644
--- a/.github/workflows/coverity.yaml
+++ b/.github/workflows/coverity.yaml
@@ -12,9 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- name: Analyze with Coverity
run: |
wget -q https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_TOKEN&project=spotbugs%2Fspotbugs-maven-plugin" -O coverity_tool.tgz
diff --git a/.github/workflows/it.yaml b/.github/workflows/it.yaml
index 520976090..020183f1b 100644
--- a/.github/workflows/it.yaml
+++ b/.github/workflows/it.yaml
@@ -28,9 +28,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- name: Build Setup
run: ./mvnw clean install
- name: Integration Test with Maven
diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
index a9309bfeb..0e64d256e 100644
--- a/.github/workflows/site.yaml
+++ b/.github/workflows/site.yaml
@@ -12,9 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- uses: webfactory/ssh-agent@master
with:
ssh-private-key: ${{ secrets.DEPLOY_KEY }}
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index c5a4743d5..339ea53dd 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -15,9 +15,10 @@ jobs:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- name: Analyze with SonarCloud
run: ./mvnw verify sonar:sonar -B -D"sonar.projectKey=spotbugs_spotbugs-maven-plugin" -D"sonar.organization=spotbugs" -D"sonar.host.url=https://sonarcloud.io" -D"sonar.login=$SONAR_TOKEN"
env:
diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
index d30af7834..13dcffa8f 100644
--- a/.github/workflows/sonatype.yaml
+++ b/.github/workflows/sonatype.yaml
@@ -12,9 +12,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up JDK
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v2
with:
java-version: 11
+ distribution: 'zulu'
- name: Deploy to Sonatype
run: ./mvnw deploy -DskipTests -B --settings ./.mvn/settings.xml
env:
From 6750230f64e25b957db4639f713508423c777a47 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Apr 2021 05:23:58 +0000
Subject: [PATCH 0504/1013] Bump spotbugs from 4.2.2 to 4.2.3
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.2...4.2.3)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f90d1c5df..e6c00dd81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.0
- 4.2.2
+ 4.2.34.2.22.0.0-alpha1
From 52d45f6472696f8a294a0a3e867ad69784297077 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:09:24 -0400
Subject: [PATCH 0505/1013] [actions] Move coveralls to ubuntu so it works
---
.github/workflows/coveralls.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
index 0e3d5d44b..05af3f4b9 100644
--- a/.github/workflows/coveralls.yaml
+++ b/.github/workflows/coveralls.yaml
@@ -21,7 +21,7 @@ on: [push, pull_request]
jobs:
build:
if: github.repository_owner == 'spotbugs-OFF'
- runs-on: windows-latest
+ runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK
From b95aa1972c436121b43008b57e6957a76ae1284c Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:11:01 -0400
Subject: [PATCH 0506/1013] [pom] Bump junit to 5.7.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index e6c00dd81..9197753b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
${project.version}
- 5.7.0
+ 5.7.14.2.34.2.22.0.0-alpha1
From c4f5bc1c83e5ff37936c5465ba51c53c79f29ede Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:11:16 -0400
Subject: [PATCH 0507/1013] [pom] BUmp spotbugs tag to 4.2.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9197753b7..817e48251 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
5.7.14.2.3
- 4.2.2
+ 4.2.32.0.0-alpha11.10.9
From ae9844c2fa333b82ab055722aaecae0810603f83 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:18:26 -0400
Subject: [PATCH 0508/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.2.3
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 817e48251..0e5b83cc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.3-SNAPSHOT
+ 4.2.3maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.2.3GitHub Issues
From 03f99d37b18fa24335ad02f3e6c8e4b0c12a6061 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:18:27 -0400
Subject: [PATCH 0509/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0e5b83cc9..9765c5d15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.3
+ 4.2.4-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.2.3
+ HEADGitHub Issues
From 0e3d99e43ec5966697c9f88d3b173ad99a764a3e Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 16 Apr 2021 21:25:03 -0400
Subject: [PATCH 0510/1013] [pom] Remove the release plugin overrides as its ok
to push changes immediately
---
pom.xml | 8 --------
1 file changed, 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9765c5d15..27908c34d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -669,14 +669,6 @@
true
-
- org.apache.maven.plugins
- maven-release-plugin
-
- false
- true
-
-
From bd35116a6de47afbee11fb4d536f9d481b403e38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 05:19:54 +0000
Subject: [PATCH 0511/1013] Bump groovyVersion from 3.0.7 to 3.0.8
Bumps `groovyVersion` from 3.0.7 to 3.0.8.
Updates `groovy` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.7 to 3.0.8
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 27908c34d..c8bbe232c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
2.0.0-alpha11.10.9
- 3.0.7
+ 3.0.81.9.11.9.2
From 0b576078c15f2e5ba92bf2f97180f6cd516380be Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Apr 2021 16:03:39 +0000
Subject: [PATCH 0512/1013] Bump ant from 1.10.9 to 1.10.10
Bumps ant from 1.10.9 to 1.10.10.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c8bbe232c..9d59a93e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
4.2.32.0.0-alpha1
- 1.10.9
+ 1.10.103.0.81.9.1
From 79d12355e211659aba6e0a8b49089589511b58b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Apr 2021 05:24:08 +0000
Subject: [PATCH 0513/1013] Bump pluginPluginVersion from 3.6.0 to 3.6.1
Bumps `pluginPluginVersion` from 3.6.0 to 3.6.1.
Updates `maven-plugin-annotations` from 3.6.0 to 3.6.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.0...maven-plugin-tools-3.6.1)
Updates `maven-plugin-plugin` from 3.6.0 to 3.6.1
- [Release notes](https://github.com/apache/maven-plugin-tools/releases)
- [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.6.0...maven-plugin-tools-3.6.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9d59a93e7..fd5376f27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,7 +148,7 @@
3.1.13.2.23.2.0
- 3.6.0
+ 3.6.11.11.23.9.13.6
From f82016489db6eb74984bdafe78b395ec040c8018 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 05:41:32 +0000
Subject: [PATCH 0514/1013] Bump maven-project-info-reports-plugin from 3.1.1
to 3.1.2
Bumps [maven-project-info-reports-plugin](https://github.com/apache/maven-project-info-reports-plugin) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/apache/maven-project-info-reports-plugin/releases)
- [Commits](https://github.com/apache/maven-project-info-reports-plugin/compare/maven-project-info-reports-plugin-3.1.1...maven-project-info-reports-plugin-3.1.2)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fd5376f27..fdb0f91ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@
1.80.22-11.12.1
- 3.1.1
+ 3.1.23.2.23.2.03.6.1
From d32d011ec7b979a50c341f309facde5368ca4c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81d=C3=A1m=20Balogh?=
Date: Wed, 12 May 2021 14:17:23 +0200
Subject: [PATCH 0515/1013] Add configuration parameter systemPropertyVariables
Some SpotBugs plugins such as FindSecBugs take their options using
system properties. These system properties can be set either before
calling Maven (as environmental variables) or as the parameter to Maven
(using the -D command line option). However, for many users the best way
is to include these option to pom.xml. This patch makes it possible for
the SpotBugs Maven plugin using configuration parameter
systemPropertyVariables.
---
.../invoker.properties | 4 ++
src/it/systemPropertyVariables/pom.xml | 53 +++++++++++++++++++
src/it/systemPropertyVariables/verify.groovy | 18 +++++++
.../mojo/spotbugs/SpotBugsMojo.groovy | 15 ++++++
4 files changed, 90 insertions(+)
create mode 100644 src/it/systemPropertyVariables/invoker.properties
create mode 100644 src/it/systemPropertyVariables/pom.xml
create mode 100644 src/it/systemPropertyVariables/verify.groovy
diff --git a/src/it/systemPropertyVariables/invoker.properties b/src/it/systemPropertyVariables/invoker.properties
new file mode 100644
index 000000000..7fbf7d99f
--- /dev/null
+++ b/src/it/systemPropertyVariables/invoker.properties
@@ -0,0 +1,4 @@
+invoker.goals = clean compile site
+
+# The expected result of the build, possible values are "success" (default) and "failure"
+invoker.buildResult = success
diff --git a/src/it/systemPropertyVariables/pom.xml b/src/it/systemPropertyVariables/pom.xml
new file mode 100644
index 000000000..e2d901322
--- /dev/null
+++ b/src/it/systemPropertyVariables/pom.xml
@@ -0,0 +1,53 @@
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ common
+ testing
+ ../common.xml
+
+ systemPropertyVariables
+ systemPropertyVariables
+ jar
+
+ true
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+
+ true
+
+
+ true
+ true
+
+
+ com.h3xstream.findsecbugs
+ findsecbugs-plugin
+ @findsecbugsVersion@
+
+
+
+
+
+
+
diff --git a/src/it/systemPropertyVariables/verify.groovy b/src/it/systemPropertyVariables/verify.groovy
new file mode 100644
index 000000000..1d5d6a834
--- /dev/null
+++ b/src/it/systemPropertyVariables/verify.groovy
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+assert buildLog.text.contains( '[java] INFO: System variables are considered to be tainted' )
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index d5adea5c4..ddd7145b1 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -520,6 +520,16 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
@Parameter(property = "spotbugs.userPrefs")
String userPrefs
+ /**
+ *
+ * System properties to set in the VM (or the forked VM if fork is enabled).
+ *
+ *
+ * @since 4.2.4
+ */
+ @Parameter(property = "spotbugs.systemPropertyVariables")
+ Map systemPropertyVariables
+
int bugCount
int errorCount
@@ -1079,6 +1089,11 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
arg(value: spotbugsArg)
}
+ systemPropertyVariables.each { sysProp ->
+ log.debug("System property ${sysProp.key} is ${sysProp.value}")
+ sysproperty(key: sysProp.key, value: sysProp.value)
+ }
+
}
if (log.isDebugEnabled()) {
From 6768e81358c11d2af1597b05fe868006203c68ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 May 2021 05:47:19 +0000
Subject: [PATCH 0516/1013] Bump jgit.version from 5.11.0.202103091610-r to
5.11.1.202105131744-r
Bumps `jgit.version` from 5.11.0.202103091610-r to 5.11.1.202105131744-r.
Updates `org.eclipse.jgit` from 5.11.0.202103091610-r to 5.11.1.202105131744-r
Updates `org.eclipse.jgit.ssh.jsch` from 5.11.0.202103091610-r to 5.11.1.202105131744-r
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fdb0f91ba..2c9879758 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
4.0.47.4.7
- 5.11.0.202103091610-r
+ 5.11.1.202105131744-r9.1
From 43fcb930b8bad971e221866974ab130538245a19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 05:42:04 +0000
Subject: [PATCH 0517/1013] Bump maven-javadoc-plugin from 3.2.0 to 3.3.0
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.2.0...maven-javadoc-plugin-3.3.0)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2c9879758..0e67230b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
1.12.13.1.23.2.2
- 3.2.0
+ 3.3.03.6.11.11.23.9.1
From 096f0cd9aa6a40ad5313bc2586f05b1b4de83ecf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 May 2021 05:04:52 +0000
Subject: [PATCH 0518/1013] Bump commons-io from 2.8.0 to 2.9.0
Bumps commons-io from 2.8.0 to 2.9.0.
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0e67230b2..daa772356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
1.153.2.22.1
- 2.8.0
+ 2.9.03.12.0
From bf81b270aec914f81a112c115b588f00ae9222cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Jun 2021 05:07:54 +0000
Subject: [PATCH 0519/1013] Bump jgit.version from 5.11.1.202105131744-r to
5.12.0.202106070339-r
Bumps `jgit.version` from 5.11.1.202105131744-r to 5.12.0.202106070339-r.
Updates `org.eclipse.jgit` from 5.11.1.202105131744-r to 5.12.0.202106070339-r
Updates `org.eclipse.jgit.ssh.jsch` from 5.11.1.202105131744-r to 5.12.0.202106070339-r
---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.jsch
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index daa772356..3bcb15520 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
4.0.47.4.7
- 5.11.1.202105131744-r
+ 5.12.0.202106070339-r9.1
From fb638bb96017e78acb1d84c2c884e84b58cf511e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 05:58:05 +0000
Subject: [PATCH 0520/1013] Bump commons-io from 2.9.0 to 2.10.0
Bumps commons-io from 2.9.0 to 2.10.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3bcb15520..3f4230cbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
1.153.2.22.1
- 2.9.0
+ 2.10.03.12.0
From 608892afcde7379c72a30553d6ae4767ac25f873 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Jun 2021 19:01:15 +0000
Subject: [PATCH 0521/1013] Bump doxiaVersion from 1.9.1 to 1.10
Bumps `doxiaVersion` from 1.9.1 to 1.10.
Updates `doxia-core` from 1.9.1 to 1.10
- [Release notes](https://github.com/apache/maven-doxia/releases)
- [Commits](https://github.com/apache/maven-doxia/compare/doxia-1.9.1...doxia-1.10)
Updates `doxia-sink-api` from 1.9.1 to 1.10
- [Release notes](https://github.com/apache/maven-doxia/releases)
- [Commits](https://github.com/apache/maven-doxia/compare/doxia-1.9.1...doxia-1.10)
---
updated-dependencies:
- dependency-name: org.apache.maven.doxia:doxia-core
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.doxia:doxia-sink-api
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3f4230cbf..8339134a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,7 @@
1.10.103.0.8
- 1.9.1
+ 1.101.9.23.2.5
From 16675bed90fa28c0d6df7fecf42756f721343493 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jun 2021 19:01:26 +0000
Subject: [PATCH 0522/1013] Bump asm.version from 9.1 to 9.2
Bumps `asm.version` from 9.1 to 9.2.
Updates `asm` from 9.1 to 9.2
Updates `asm-analysis` from 9.1 to 9.2
Updates `asm-commons` from 9.1 to 9.2
Updates `asm-tree` from 9.1 to 9.2
Updates `asm-util` from 9.1 to 9.2
---
updated-dependencies:
- dependency-name: org.ow2.asm:asm
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-analysis
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-commons
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-tree
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.ow2.asm:asm-util
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8339134a2..7056740f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -178,7 +178,7 @@
5.12.0.202106070339-r
- 9.1
+ 9.21.9.41.21.15
From a0199d534011091c800dd76bf692789f02b75ad9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 19:02:18 +0000
Subject: [PATCH 0523/1013] Bump doxiaSiteToolsVersion from 1.9.2 to 1.10
Bumps `doxiaSiteToolsVersion` from 1.9.2 to 1.10.
Updates `doxia-decoration-model` from 1.9.2 to 1.10
- [Release notes](https://github.com/apache/maven-doxia-sitetools/releases)
- [Commits](https://github.com/apache/maven-doxia-sitetools/compare/doxia-sitetools-1.9.2...doxia-sitetools-1.10)
Updates `doxia-site-renderer` from 1.9.2 to 1.10
- [Release notes](https://github.com/apache/maven-doxia-sitetools/releases)
- [Commits](https://github.com/apache/maven-doxia-sitetools/compare/doxia-sitetools-1.9.2...doxia-sitetools-1.10)
Updates `doxia-integration-tools` from 1.9.2 to 1.10
- [Release notes](https://github.com/apache/maven-doxia-sitetools/releases)
- [Commits](https://github.com/apache/maven-doxia-sitetools/compare/doxia-sitetools-1.9.2...doxia-sitetools-1.10)
---
updated-dependencies:
- dependency-name: org.apache.maven.doxia:doxia-decoration-model
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.doxia:doxia-site-renderer
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.doxia:doxia-integration-tools
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7056740f2..6719b157f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
3.0.81.10
- 1.9.2
+ 1.103.2.50.13.1
From f1832b0039e25bdec054b2aebdca85e5cb5c19a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 21:08:45 +0000
Subject: [PATCH 0524/1013] Bump mavenVersion from 3.5.2 to 3.8.1
Bumps `mavenVersion` from 3.5.2 to 3.8.1.
Updates `maven-plugin-api` from 3.5.2 to 3.8.1
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.5.2...maven-3.8.1)
Updates `maven-artifact` from 3.5.2 to 3.8.1
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.5.2...maven-3.8.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6719b157f..9d1a284ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
0.13.13.03.0.0
- 3.5.2
+ 3.8.12.1.01.1.0
From 787d0374f81c747bd3a48b57ec171d1af6c563b4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Jul 2021 21:08:50 +0000
Subject: [PATCH 0525/1013] Bump maven-core from 3.2.5 to 3.8.1
Bumps [maven-core](https://github.com/apache/maven) from 3.2.5 to 3.8.1.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.2.5...maven-3.8.1)
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6719b157f..c8159a7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
1.101.10
- 3.2.5
+ 3.8.10.13.13.03.0.0
From 9f1fdbf2570793931275e53eb431b34e976d3445 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jul 2021 19:01:36 +0000
Subject: [PATCH 0526/1013] Bump slf4jVersion from 2.0.0-alpha1 to 2.0.0-alpha2
Bumps `slf4jVersion` from 2.0.0-alpha1 to 2.0.0-alpha2.
Updates `jcl-over-slf4j` from 2.0.0-alpha1 to 2.0.0-alpha2
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)
Updates `slf4j-simple` from 2.0.0-alpha1 to 2.0.0-alpha2
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)
Updates `slf4j-api` from 2.0.0-alpha1 to 2.0.0-alpha2
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits)
---
updated-dependencies:
- dependency-name: org.slf4j:jcl-over-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-simple
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6719b157f..ff4dfc09a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
5.7.14.2.34.2.3
- 2.0.0-alpha1
+ 2.0.0-alpha21.10.103.0.8
From 555efeeffe15b9ec4919fed1e452122c22ae1d2a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Jul 2021 19:01:51 +0000
Subject: [PATCH 0527/1013] Bump spotbugs from 4.2.3 to 4.3.0
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.2.3 to 4.3.0.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.2.3...4.3.0)
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6719b157f..159caee36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.1
- 4.2.3
+ 4.3.04.2.32.0.0-alpha1
From 8ebfd75f70571ebfffae7781dae3783547fba007 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 3 Jul 2021 15:38:48 -0400
Subject: [PATCH 0528/1013] [ci] Update since date as we switched to 4.3.x
---
src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index ddd7145b1..3d41ca1eb 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -525,7 +525,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
* System properties to set in the VM (or the forked VM if fork is enabled).
*
*
- * @since 4.2.4
+ * @since 4.3.0
*/
@Parameter(property = "spotbugs.systemPropertyVariables")
Map systemPropertyVariables
From 92876e8d7091b4e5a572178807d835636add3294 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 3 Jul 2021 15:40:08 -0400
Subject: [PATCH 0529/1013] [pom] Remove old maven comment as we are now going
to latest 3.8.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ad96ad6f9..f3f45f952 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
0.13.13.03.0.0
- 3.8.1
+ 3.8.12.1.01.1.0
From c9733e9bb4f4545a14e2bed2147f17f9e20d1ca6 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 3 Jul 2021 15:40:20 -0400
Subject: [PATCH 0530/1013] [pom] Bump spotbugs to 4.3.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f3f45f952..96176af9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
5.7.14.3.0
- 4.2.3
+ 4.3.02.0.0-alpha21.10.10
From a32d2b36c5679a16f776486913d7d2484cbc5225 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 9 Jul 2021 23:49:06 -0400
Subject: [PATCH 0531/1013] [pom] Bump junit to 5.7.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 96176af9f..5e04371f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
${project.version}
- 5.7.1
+ 5.7.24.3.04.3.02.0.0-alpha2
From 5530040d7940f5326f844f2ef38b8e487da1537b Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 9 Jul 2021 23:53:39 -0400
Subject: [PATCH 0532/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.3.0
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e04371f1..11cc39a19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.2.4-SNAPSHOT
+ 4.3.0maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.3.0GitHub Issues
From d06e99448168d7a0252db8e1f7f7c492225f0cf2 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 9 Jul 2021 23:53:45 -0400
Subject: [PATCH 0533/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 11cc39a19..0ab86fc66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.3.0
+ 4.3.1-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.3.0
+ HEADGitHub Issues
From 00d51ee6392841806601c354df08c69d9a468996 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 19:01:17 +0000
Subject: [PATCH 0534/1013] Bump commons-io from 2.10.0 to 2.11.0
Bumps commons-io from 2.10.0 to 2.11.0.
---
updated-dependencies:
- dependency-name: commons-io:commons-io
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0ab86fc66..5ada094d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,7 +184,7 @@
1.153.2.22.1
- 2.10.0
+ 2.11.03.12.0
From 02a2c8b56d4a733157f063788a91044ac3ba20eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 19:01:20 +0000
Subject: [PATCH 0535/1013] Bump ant from 1.10.10 to 1.10.11
Bumps ant from 1.10.10 to 1.10.11.
---
updated-dependencies:
- dependency-name: org.apache.ant:ant
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0ab86fc66..fe803fb7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
4.3.02.0.0-alpha2
- 1.10.10
+ 1.10.113.0.81.10
From 9c512844d5a8a5320295972884d5fc9f0ee9ccf3 Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Thu, 29 Jul 2021 09:43:43 -0400
Subject: [PATCH 0536/1013] Add support for SARIF format with the argument
-Dspotbugs.sarifOutput=true
---
pom.xml | 13 +++
.../mojo/spotbugs/SpotBugsMojo.groovy | 80 ++++++++++++++-----
2 files changed, 75 insertions(+), 18 deletions(-)
diff --git a/pom.xml b/pom.xml
index 934761afd..64b109ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -329,6 +329,19 @@
+
+ org.codehaus.groovy
+ groovy-json
+ ${groovyVersion}
+ indy
+
+
+ org.codehaus.groovy
+ groovy
+
+
+
+
org.apache.maven.reportingmaven-reporting-impl
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 3d41ca1eb..7be2b5dd2 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -19,10 +19,9 @@ package org.codehaus.mojo.spotbugs
* under the License.
*/
+import groovy.json.JsonSlurper
import groovy.xml.XmlSlurper
import groovy.xml.StreamingMarkupBuilder
-
-import org.apache.maven.artifact.Artifact
import org.apache.maven.artifact.repository.ArtifactRepository
import org.apache.maven.doxia.siterenderer.Renderer
@@ -32,8 +31,7 @@ import org.apache.maven.execution.MavenSession
import org.apache.maven.plugin.MojoExecutionException
-import org.apache.maven.plugins.annotations.Component;
-import org.apache.maven.plugins.annotations.LifecyclePhase
+import org.apache.maven.plugins.annotations.Component
import org.apache.maven.plugins.annotations.Mojo
import org.apache.maven.plugins.annotations.Parameter
import org.apache.maven.plugins.annotations.ResolutionScope
@@ -46,7 +44,6 @@ import org.apache.maven.repository.RepositorySystem
import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver
import org.codehaus.plexus.resource.ResourceManager
-import org.codehaus.plexus.resource.loader.FileResourceCreationException
import org.codehaus.plexus.resource.loader.FileResourceLoader
/**
@@ -71,6 +68,16 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
@Parameter(defaultValue = "false", property = "spotbugs.xmlOutput", required = true)
boolean xmlOutput
+ /**
+ * Turn on and off SARIF output of the Spotbugs report.
+ * SARIF is a JSON format standardize for all code scanning tools.
+ * https://docs.github.com/en/code-security/secure-coding/integrating-with-code-scanning/sarif-support-for-code-scanning
+ *
+ * @since 4.3.1
+ */
+ @Parameter(defaultValue = "false", property = "spotbugs.sarifOutput", required = true)
+ boolean sarifOutput
+
/**
* Specifies the directory where the xml output will be generated.
*
@@ -845,7 +852,12 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
args << resourceHelper.getResourceFile(userPrefs.trim())
}
- args << "-xml:withMessages"
+ if(!sarifOutput) {
+ args << "-xml:withMessages"
+ }
+ else {
+ args << "-sarif"
+ }
args << "-auxclasspathFromInput"
@@ -1000,6 +1012,21 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
return auxClasspath
}
+ /**
+ * For the file creation by creating the file AND folder if needed.
+ * The file created will be empty.
+ *
+ * @param file Destination file to create.
+ */
+ private void forceFileCreation(File file) {
+ if (file.exists()) {
+ file.delete()
+ }
+
+ file.getParentFile().mkdirs()
+ file.createNewFile()
+ }
+
/**
* Set up and run the Spotbugs engine.
*
@@ -1012,14 +1039,16 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug("****** SpotBugsMojo executeSpotbugs *******")
long startTime, duration
- File tempFile = new File("${project.build.directory}/spotbugsTemp.xml")
+ File xmlTempFile = new File("${project.build.directory}/spotbugsTemp.xml")
+ File sarifTempFile = new File("${project.build.directory}/spotbugsSarif.json")
- if (tempFile.exists()) {
- tempFile.delete()
+ if (xmlOutput || !sarifOutput) {
+ forceFileCreation(xmlTempFile)
+ }
+ else {
+ forceFileCreation(sarifTempFile)
}
- tempFile.getParentFile().mkdirs()
- tempFile.createNewFile()
outputEncoding = outputEncoding ?: 'UTF-8'
@@ -1035,7 +1064,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug(" Plugin Artifacts to be added -> ${pluginArtifacts.toString()}")
log.debug("outputFile is " + outputFile.getCanonicalPath())
log.debug("output Directory is " + spotbugsXmlOutputDirectory.getAbsolutePath())
- log.debug("Temp File is " + tempFile.getCanonicalPath())
+ log.debug("Temp File is " + xmlTempFile.getCanonicalPath())
}
def ant = new AntBuilder()
@@ -1046,7 +1075,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
startTime = System.nanoTime()
}
- def spotbugsArgs = getSpotbugsArgs(tempFile)
+ def spotbugsArgs = !sarifOutput ? getSpotbugsArgs(xmlTempFile) : getSpotbugsArgs(sarifTempFile)
def effectiveEncoding = System.getProperty("file.encoding", "UTF-8")
@@ -1055,7 +1084,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
ant.java(classname: "edu.umd.cs.findbugs.FindBugs2", inputstring: getSpotbugsAuxClasspath(), fork: "${fork}", failonerror: "true", clonevm: "false", timeout: "${timeout}", maxmemory: "${maxHeap}m") {
-
+ //this.executeSpotbugs()
log.debug("File Encoding is " + effectiveEncoding)
sysproperty(key: "file.encoding", value: effectiveEncoding)
@@ -1103,10 +1132,10 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.info("Done SpotBugs Analysis....")
- if (tempFile.exists()) {
+ if (xmlTempFile.exists() && !sarifOutput) {
- if (tempFile.size() > 0) {
- def path = new XmlSlurper().parse(tempFile)
+ if (xmlTempFile.size() > 0) {
+ def path = new XmlSlurper().parse(xmlTempFile)
def allNodes = path.depthFirst().collect { it }
@@ -1159,11 +1188,26 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
if (!log.isDebugEnabled()) {
- tempFile.delete()
+ xmlTempFile.delete()
}
}
+ if(sarifTempFile && sarifOutput) {
+ if (sarifTempFile.size() > 0) {
+ def path = new JsonSlurper().parse(sarifTempFile)
+
+ try {
+
+ def results = path.runs.results[0]
+ log.debug("BugInstance size is ${results.size()}")
+ }
+ catch (Exception e) {
+ log.error("Unexpected format for the file $sarifTempFile",e)
+ }
+ }
+ }
+
}
/**
From 0aaac98615c54ded66d28fbcc1c5806147510497 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Jul 2021 19:01:23 +0000
Subject: [PATCH 0537/1013] Bump plexus-utils from 3.3.0 to 3.4.0
Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.3.0...plexus-utils-3.4.0)
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 934761afd..390270537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
2.1.01.1.0
- 3.3.0
+ 3.4.03.0.01.8
From e5ad8f2138752c0590cfbc73e15fc56c1c937849 Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Fri, 30 Jul 2021 15:27:16 -0400
Subject: [PATCH 0538/1013] Change output to show SARIF file when debug is
enable. +Minor refactoring for the same code block
---
.../org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 7be2b5dd2..5540cd6b4 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -1060,11 +1060,11 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
resourceManager.setOutputDirectory(new File(project.getBuild().getDirectory()))
if (log.isDebugEnabled()) {
- log.debug("resourceManager outputDirectory is ${resourceManager.outputDirectory}")
- log.debug(" Plugin Artifacts to be added -> ${pluginArtifacts.toString()}")
- log.debug("outputFile is " + outputFile.getCanonicalPath())
- log.debug("output Directory is " + spotbugsXmlOutputDirectory.getAbsolutePath())
- log.debug("Temp File is " + xmlTempFile.getCanonicalPath())
+ log.debug("resourceManager.outputDirectory is ${resourceManager.outputDirectory}")
+ log.debug("Plugin Artifacts to be added -> ${pluginArtifacts.toString()}")
+ log.debug("outputFile is ${outputFile.getCanonicalPath()}")
+ log.debug("output Directory is ${spotbugsXmlOutputDirectory.getAbsolutePath()}")
+ log.debug("TempFile is ${(sarifOutput ? sarifTempFile : xmlTempFile).getCanonicalPath()}");
}
def ant = new AntBuilder()
From cd0db6c94addfaa9bdd3bfdd456518d5af2a3dfe Mon Sep 17 00:00:00 2001
From: Michael Keppler
Date: Sat, 7 Aug 2021 16:09:11 +0200
Subject: [PATCH 0539/1013] Fix typo
---
src/site/fml/faq.fml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml
index 250becf39..fbd15e851 100644
--- a/src/site/fml/faq.fml
+++ b/src/site/fml/faq.fml
@@ -30,7 +30,7 @@
- You can also use the fork option which will for a new JVM. You then use the maxHeap option to control the heap size.
+ You can also use the fork option which will fork a new JVM. You then use the maxHeap option to control the heap size.
From 514eb1a8075cef2bf7fad1b1d0c9f4e8f7004003 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Aug 2021 19:01:55 +0000
Subject: [PATCH 0540/1013] Bump slf4jVersion from 2.0.0-alpha2 to 2.0.0-alpha3
Bumps `slf4jVersion` from 2.0.0-alpha2 to 2.0.0-alpha3.
Updates `jcl-over-slf4j` from 2.0.0-alpha2 to 2.0.0-alpha3
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits/v_2.0.0-alpha3)
Updates `slf4j-simple` from 2.0.0-alpha2 to 2.0.0-alpha3
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits/v_2.0.0-alpha3)
Updates `slf4j-api` from 2.0.0-alpha2 to 2.0.0-alpha3
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/commits/v_2.0.0-alpha3)
---
updated-dependencies:
- dependency-name: org.slf4j:jcl-over-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-simple
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 390270537..e7707428b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
5.7.24.3.04.3.0
- 2.0.0-alpha2
+ 2.0.0-alpha31.10.113.0.8
From b7438dbf1cb4c57326054057fae0d8e09e5da95f Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Tue, 10 Aug 2021 15:38:11 -0400
Subject: [PATCH 0541/1013] Add an integration test for SARIF support
---
.gitignore | 1 +
src/it/sarif-1/invoker.properties | 4 +++
src/it/sarif-1/pom.xml | 48 +++++++++++++++++++++++++++++++
src/it/sarif-1/verify.groovy | 36 +++++++++++++++++++++++
4 files changed, 89 insertions(+)
create mode 100644 src/it/sarif-1/invoker.properties
create mode 100644 src/it/sarif-1/pom.xml
create mode 100644 src/it/sarif-1/verify.groovy
diff --git a/.gitignore b/.gitignore
index 0a6ebbc0f..9a39a682a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
.project
.settings
target/
+.idea/
*.ipr
*.iws
*.iml
diff --git a/src/it/sarif-1/invoker.properties b/src/it/sarif-1/invoker.properties
new file mode 100644
index 000000000..ccba96b66
--- /dev/null
+++ b/src/it/sarif-1/invoker.properties
@@ -0,0 +1,4 @@
+invoker.goals = clean compile compiler:testCompile site
+
+# The expected result of the build, possible values are "success" (default) and "failure"
+invoker.buildResult = success
diff --git a/src/it/sarif-1/pom.xml b/src/it/sarif-1/pom.xml
new file mode 100644
index 000000000..5a201afa8
--- /dev/null
+++ b/src/it/sarif-1/pom.xml
@@ -0,0 +1,48 @@
+
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ common
+ testing
+ ../common.xml
+
+ sarif-1
+ sarif-1
+ jar
+
+ true
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+ @jxrPluginVersion@
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+ true
+ true
+
+
+
+
+
diff --git a/src/it/sarif-1/verify.groovy b/src/it/sarif-1/verify.groovy
new file mode 100644
index 000000000..b8fcad162
--- /dev/null
+++ b/src/it/sarif-1/verify.groovy
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import groovy.json.JsonSlurper
+
+def effortLevel = 'default'
+
+
+File spotbugSarifFile = new File(basedir, 'target/spotbugsSarif.json')
+assert spotbugSarifFile.exists()
+
+
+println '**********************************'
+println "Checking SARIF file"
+println '**********************************'
+
+def path = new JsonSlurper().parse(spotbugSarifFile)
+
+def results = path.runs.results[0]
+println "BugInstance size is ${results.size()}"
+
+
+assert results.size() > 0
\ No newline at end of file
From 545f79864c911cdc2127d5098fe9c705a43b1316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Aug 2021 19:02:30 +0000
Subject: [PATCH 0542/1013] Bump scmPluginVersion from 1.11.2 to 1.11.3
Bumps `scmPluginVersion` from 1.11.2 to 1.11.3.
Updates `maven-scm-provider-jgit` from 1.11.2 to 1.11.3
Updates `maven-scm-plugin` from 1.11.2 to 1.11.3
- [Release notes](https://github.com/apache/maven-scm/releases)
- [Commits](https://github.com/apache/maven-scm/compare/maven-scm-1.11.2...maven-scm-1.11.3)
---
updated-dependencies:
- dependency-name: org.apache.maven.scm:maven-scm-provider-jgit
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven.plugins:maven-scm-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 390270537..1179eccb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
3.2.23.3.03.6.1
- 1.11.2
+ 1.11.33.9.13.62.8.1
From 4c9882867d4d20920542ef328dca656f3a7ebafd Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Wed, 11 Aug 2021 23:13:32 -0400
Subject: [PATCH 0543/1013] Remove commented code (commit by accident)
---
src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 5540cd6b4..25a324499 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -1084,7 +1084,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
ant.java(classname: "edu.umd.cs.findbugs.FindBugs2", inputstring: getSpotbugsAuxClasspath(), fork: "${fork}", failonerror: "true", clonevm: "false", timeout: "${timeout}", maxmemory: "${maxHeap}m") {
- //this.executeSpotbugs()
+
log.debug("File Encoding is " + effectiveEncoding)
sysproperty(key: "file.encoding", value: effectiveEncoding)
From 7e4e5de20b3526b6c9d8ed33f152c0278fd551c2 Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Wed, 11 Aug 2021 23:16:08 -0400
Subject: [PATCH 0544/1013] Rename sarifTempFile to sarifFile to emphasis that
it is the final file and not something temporary
---
.../codehaus/mojo/spotbugs/SpotBugsMojo.groovy | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 25a324499..2f2733080 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -1040,13 +1040,13 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
long startTime, duration
File xmlTempFile = new File("${project.build.directory}/spotbugsTemp.xml")
- File sarifTempFile = new File("${project.build.directory}/spotbugsSarif.json")
+ File sarifFile = new File("${project.build.directory}/spotbugsSarif.json")
if (xmlOutput || !sarifOutput) {
forceFileCreation(xmlTempFile)
}
else {
- forceFileCreation(sarifTempFile)
+ forceFileCreation(sarifFile)
}
@@ -1064,7 +1064,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug("Plugin Artifacts to be added -> ${pluginArtifacts.toString()}")
log.debug("outputFile is ${outputFile.getCanonicalPath()}")
log.debug("output Directory is ${spotbugsXmlOutputDirectory.getAbsolutePath()}")
- log.debug("TempFile is ${(sarifOutput ? sarifTempFile : xmlTempFile).getCanonicalPath()}");
+ log.debug("TempFile is ${(sarifOutput ? sarifFile : xmlTempFile).getCanonicalPath()}");
}
def ant = new AntBuilder()
@@ -1075,7 +1075,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
startTime = System.nanoTime()
}
- def spotbugsArgs = !sarifOutput ? getSpotbugsArgs(xmlTempFile) : getSpotbugsArgs(sarifTempFile)
+ def spotbugsArgs = !sarifOutput ? getSpotbugsArgs(xmlTempFile) : getSpotbugsArgs(sarifFile)
def effectiveEncoding = System.getProperty("file.encoding", "UTF-8")
@@ -1193,9 +1193,9 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
- if(sarifTempFile && sarifOutput) {
- if (sarifTempFile.size() > 0) {
- def path = new JsonSlurper().parse(sarifTempFile)
+ if(sarifFile && sarifOutput) {
+ if (sarifFile.size() > 0) {
+ def path = new JsonSlurper().parse(sarifFile)
try {
@@ -1203,7 +1203,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug("BugInstance size is ${results.size()}")
}
catch (Exception e) {
- log.error("Unexpected format for the file $sarifTempFile",e)
+ log.error("Unexpected format for the file $sarifFile",e)
}
}
}
From 16c8bbcd9354790474f3f2959ad46eac6427b448 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Aug 2021 19:01:39 +0000
Subject: [PATCH 0545/1013] Bump slf4jVersion from 2.0.0-alpha3 to 2.0.0-alpha4
Bumps `slf4jVersion` from 2.0.0-alpha3 to 2.0.0-alpha4.
Updates `jcl-over-slf4j` from 2.0.0-alpha3 to 2.0.0-alpha4
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha3...v_2.0.0-alpha4)
Updates `slf4j-simple` from 2.0.0-alpha3 to 2.0.0-alpha4
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha3...v_2.0.0-alpha4)
Updates `slf4j-api` from 2.0.0-alpha3 to 2.0.0-alpha4
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha3...v_2.0.0-alpha4)
---
updated-dependencies:
- dependency-name: org.slf4j:jcl-over-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-simple
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 047c7bfa8..9315a4190 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
5.7.24.3.04.3.0
- 2.0.0-alpha3
+ 2.0.0-alpha41.10.113.0.8
From 77a86a770c14e7ce1c92482df49497becc3061ac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Aug 2021 19:01:23 +0000
Subject: [PATCH 0546/1013] Bump spotbugs from 4.3.0 to 4.4.0
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.3.0...4.4.0)
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9315a4190..7d05baa7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.2
- 4.3.0
+ 4.4.04.3.02.0.0-alpha4
From 04264e583c89981e2bd0cf8a164d0eb849854dff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Aug 2021 19:01:32 +0000
Subject: [PATCH 0547/1013] Bump maven-core from 3.8.1 to 3.8.2
Bumps [maven-core](https://github.com/apache/maven) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.1...maven-3.8.2)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9315a4190..218f9639a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
1.101.10
- 3.8.1
+ 3.8.20.13.13.03.0.0
From 56bcea4ba1c59124742c8a01f9aed307fe2ad871 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Aug 2021 19:01:40 +0000
Subject: [PATCH 0548/1013] Bump mavenVersion from 3.8.1 to 3.8.2
Bumps `mavenVersion` from 3.8.1 to 3.8.2.
Updates `maven-plugin-api` from 3.8.1 to 3.8.2
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.1...maven-3.8.2)
Updates `maven-artifact` from 3.8.1 to 3.8.2
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.1...maven-3.8.2)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-artifact
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9315a4190..f3cd235c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
0.13.13.03.0.0
- 3.8.1
+ 3.8.22.1.01.1.0
From 314171e76274da14ee57ad34953b849174b5e93b Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Thu, 19 Aug 2021 14:06:22 -0400
Subject: [PATCH 0549/1013] Add the option to transform relative path to
complete path in SARIF report Complement to the SARIF mode introduce in #339
---
.../mojo/spotbugs/SourceFileIndexer.groovy | 144 ++++++++++++++++++
.../mojo/spotbugs/SpotBugsMojo.groovy | 64 ++++++--
2 files changed, 194 insertions(+), 14 deletions(-)
create mode 100644 src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
new file mode 100644
index 000000000..86c8daa32
--- /dev/null
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
@@ -0,0 +1,144 @@
+package org.codehaus.mojo.spotbugs
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.maven.execution.MavenSession
+import org.apache.maven.model.Resource
+import org.apache.maven.project.MavenProject
+
+import java.nio.file.Paths
+
+/**
+ * Utility class used to transform path relative to the source directory
+ * to their path relative to the root directory.
+ */
+class SourceFileIndexer {
+
+ /**
+ * List of source files found in the current Maven project
+ */
+ private List allSourceFiles;
+
+ /**
+ * Initialize the complete list of source files with their
+ *
+ * @param project Reference to the Maven project to get the list of source directories
+ * @param session Reference to the Maven session used to get the location of the root directory
+ */
+ protected void buildListSourceFiles(MavenProject project, MavenSession session) {
+
+ //String basePath = project.basedir.absolutePath
+ String basePath = session.getExecutionRootDirectory()
+
+ def allSourceFiles = new ArrayList<>()
+ //Resource
+ for(Resource r in project.getResources()) {
+ scanDirectory(new File(r.directory), allSourceFiles, basePath)
+ }
+ for(Resource r in project.getTestResources()) {
+ scanDirectory(new File(r.directory), allSourceFiles, basePath)
+ }
+ //Source files
+ for(String sourceRoot in project.getCompileSourceRoots()) {
+ scanDirectory(new File(sourceRoot), allSourceFiles, basePath)
+ }
+ for(String sourceRoot in project.getTestCompileSourceRoots()) {
+ scanDirectory(new File(sourceRoot), allSourceFiles, basePath)
+ }
+
+ for(String sourceRoot in project.getScriptSourceRoots()) {
+ scanDirectory(new File(sourceRoot), allSourceFiles, basePath)
+ }
+
+ //While not perfect, add the following paths will add basic support for Kotlin and Groovy
+ scanDirectory(new File(project.getBasedir(),"src/main/webapp"), allSourceFiles, basePath)
+ scanDirectory(new File(project.getBasedir(),"src/main/groovy"), allSourceFiles, basePath)
+ scanDirectory(new File(project.getBasedir(),"src/main/kotlin"), allSourceFiles, basePath)
+
+ this.allSourceFiles = allSourceFiles
+ }
+
+ /**
+ * Recursively scan the directory given and add all files found to the files array list.
+ * The base directory will be truncated from the path stored.
+ *
+ * @param directory Directory to scan
+ * @param files ArrayList where files found will be stored
+ * @param baseDirectory This part will be truncated from path stored
+ * @throws IOException
+ */
+ private void scanDirectory(File directory,List files,String baseDirectory) throws IOException {
+
+ if(directory.exists()) {
+ for(File child : directory.listFiles()) {
+ if(child.isDirectory()) {
+ scanDirectory(child,files,baseDirectory);
+ }
+ else {
+ if(child.canonicalPath.startsWith(baseDirectory)) {
+ //The project will not be at the root of our file system.
+ //It will most likely be stored in a work directory.
+ // /work/project-code-to-scan/src/main/java/File.java => src/main/java/File.java
+ // (Here baseDirectory is /work/project-code-to-scan/)
+ String relativePath = Paths.get(baseDirectory).relativize(Paths.get(child.path))
+ files.add(normalizePath(relativePath))
+ }
+ else {
+ files.add(normalizePath(child.path))
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Normalize path to use forward slash.
+ * This will facilitate searches.
+ *
+ * @param path Path to clean up
+ * @return Path safe to use for comparison
+ */
+ private String normalizePath(String path) {
+ return path.replaceAll("\\\\","/");
+ }
+
+ /**
+ * Transform partial path to complete path
+ *
+ * @param filename Partial name to search
+ * @return Complete path found. Null is not found!
+ */
+ protected String searchActualFilesLocation(String filename) {
+
+ if(allSourceFiles == null) {
+ throw new RuntimeException("Source files cache must be built prior to searches.")
+ }
+
+ for(String fileFound in allSourceFiles) {
+
+ if(fileFound.endsWith(filename)) {
+ return fileFound
+ }
+
+ }
+
+ return null //Not found
+ }
+}
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
index 2f2733080..02fe741b1 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SpotBugsMojo.groovy
@@ -19,6 +19,8 @@ package org.codehaus.mojo.spotbugs
* under the License.
*/
+import groovy.json.JsonBuilder
+
import groovy.json.JsonSlurper
import groovy.xml.XmlSlurper
import groovy.xml.StreamingMarkupBuilder
@@ -28,7 +30,6 @@ import org.apache.maven.doxia.siterenderer.Renderer
import org.apache.maven.doxia.tools.SiteTool
import org.apache.maven.execution.MavenSession
-
import org.apache.maven.plugin.MojoExecutionException
import org.apache.maven.plugins.annotations.Component
@@ -78,6 +79,9 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
@Parameter(defaultValue = "false", property = "spotbugs.sarifOutput", required = true)
boolean sarifOutput
+ @Parameter(defaultValue = "false", property = "spotbugs.sarifFullPath", required = true)
+ boolean sarifFullPath
+
/**
* Specifies the directory where the xml output will be generated.
*
@@ -1040,13 +1044,14 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
long startTime, duration
File xmlTempFile = new File("${project.build.directory}/spotbugsTemp.xml")
- File sarifFile = new File("${project.build.directory}/spotbugsSarif.json")
+ File sarifTempFile = new File("${project.build.directory}/spotbugsTempSarif.json")
+ File sarifFinalFile = new File("${project.build.directory}/spotbugsSarif.json")
if (xmlOutput || !sarifOutput) {
forceFileCreation(xmlTempFile)
}
else {
- forceFileCreation(sarifFile)
+ forceFileCreation(sarifTempFile)
}
@@ -1064,7 +1069,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
log.debug("Plugin Artifacts to be added -> ${pluginArtifacts.toString()}")
log.debug("outputFile is ${outputFile.getCanonicalPath()}")
log.debug("output Directory is ${spotbugsXmlOutputDirectory.getAbsolutePath()}")
- log.debug("TempFile is ${(sarifOutput ? sarifFile : xmlTempFile).getCanonicalPath()}");
+ log.debug("TempFile is ${(sarifOutput ? sarifTempFile : xmlTempFile).getCanonicalPath()}");
}
def ant = new AntBuilder()
@@ -1075,7 +1080,7 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
startTime = System.nanoTime()
}
- def spotbugsArgs = !sarifOutput ? getSpotbugsArgs(xmlTempFile) : getSpotbugsArgs(sarifFile)
+ def spotbugsArgs = !sarifOutput ? getSpotbugsArgs(xmlTempFile) : getSpotbugsArgs(sarifTempFile)
def effectiveEncoding = System.getProperty("file.encoding", "UTF-8")
@@ -1193,19 +1198,50 @@ class SpotBugsMojo extends AbstractMavenReport implements SpotBugsPluginsTrait {
}
- if(sarifFile && sarifOutput) {
- if (sarifFile.size() > 0) {
- def path = new JsonSlurper().parse(sarifFile)
+ if(sarifTempFile && sarifOutput && sarifTempFile.size() > 0) {
- try {
+ def slurpedResult = new JsonSlurper().parse(sarifTempFile)
+ def builder = new JsonBuilder(slurpedResult)
+
+ // With -Dspotbugs.sarifFullPath=true
+ // The location uri will be replace by path relative to the root of project
+ // SomeFile.java => src/main/java/SomeFile.java
+ //This change is required for some tool including Github code scanning API
+ if (sarifFullPath) {
+
+ def indexer = new SourceFileIndexer()
+
+ indexer.buildListSourceFiles(getProject(),getSession())
+
+ for (result in slurpedResult.runs.results[0]) {
+
+ for (loc in result.locations) {
+ def originalFullPath = loc.physicalLocation.artifactLocation.uri
+
+ //We replace relative path to the complete path
+ String newFileName = indexer.searchActualFilesLocation(originalFullPath)
+
+ if (newFileName != null) {
+ if(getLog().isDebugEnabled()) {
+ getLog().info("$originalFullPath modified to $newFileName")
+ }
+ loc.physicalLocation.artifactLocation.uri = newFileName
+ } else {
+ getLog().warn("No source file found for $originalFullPath. " +
+ "The path include in the SARIF report could be incomplete.")
+ }
+ }
- def results = path.runs.results[0]
- log.debug("BugInstance size is ${results.size()}")
- }
- catch (Exception e) {
- log.error("Unexpected format for the file $sarifFile",e)
}
}
+
+ sarifFinalFile.withWriter {
+ builder.writeTo(it)
+ }
+
+ if (!log.isDebugEnabled()) {
+ sarifTempFile.delete()
+ }
}
}
From aec888776e0f6b3c71538f88a2c55d3d2e613c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Aug 2021 19:01:16 +0000
Subject: [PATCH 0550/1013] Bump maven-profiler from 3.0 to 3.1.1
Bumps [maven-profiler](https://github.com/jcgay/maven-profiler) from 3.0 to 3.1.1.
- [Release notes](https://github.com/jcgay/maven-profiler/releases)
- [Changelog](https://github.com/jcgay/maven-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jcgay/maven-profiler/compare/v3.0...v3.1.1)
---
updated-dependencies:
- dependency-name: fr.jcgay.maven:maven-profiler
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
.mvn/extensions.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index 1c87ce310..4a35ac239 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -3,6 +3,6 @@
fr.jcgay.mavenmaven-profiler
- 3.0
+ 3.1.1
From 7161037bf93562b339a4a2ba695fb07ec6062dae Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Tue, 24 Aug 2021 12:19:12 -0400
Subject: [PATCH 0551/1013] Integration to cover full path expansion for sarif
report file #348
---
src/it/sarif-2/invoker.properties | 4 ++
src/it/sarif-2/pom.xml | 49 +++++++++++++++++++
src/it/sarif-2/verify.groovy | 47 ++++++++++++++++++
.../mojo/spotbugs/SourceFileIndexer.groovy | 12 +++--
4 files changed, 108 insertions(+), 4 deletions(-)
create mode 100644 src/it/sarif-2/invoker.properties
create mode 100644 src/it/sarif-2/pom.xml
create mode 100644 src/it/sarif-2/verify.groovy
diff --git a/src/it/sarif-2/invoker.properties b/src/it/sarif-2/invoker.properties
new file mode 100644
index 000000000..ccba96b66
--- /dev/null
+++ b/src/it/sarif-2/invoker.properties
@@ -0,0 +1,4 @@
+invoker.goals = clean compile compiler:testCompile site
+
+# The expected result of the build, possible values are "success" (default) and "failure"
+invoker.buildResult = success
diff --git a/src/it/sarif-2/pom.xml b/src/it/sarif-2/pom.xml
new file mode 100644
index 000000000..c90ebfc7a
--- /dev/null
+++ b/src/it/sarif-2/pom.xml
@@ -0,0 +1,49 @@
+
+
+
+
+ 4.0.0
+
+ spotbugs-maven-plugin.it
+ common
+ testing
+ ../common.xml
+
+ sarif-2
+ sarif-2
+ jar
+
+ true
+
+
+ org.apache.maven.plugins
+ maven-jxr-plugin
+ @jxrPluginVersion@
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+
+ true
+ true
+ true
+
+
+
+
+
diff --git a/src/it/sarif-2/verify.groovy b/src/it/sarif-2/verify.groovy
new file mode 100644
index 000000000..ed3ab444f
--- /dev/null
+++ b/src/it/sarif-2/verify.groovy
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2006-2020 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import groovy.json.JsonSlurper
+
+def effortLevel = 'default'
+
+
+File spotbugSarifFile = new File(basedir, 'target/spotbugsSarif.json')
+assert spotbugSarifFile.exists()
+
+
+println '**********************************'
+println "Checking SARIF file"
+println '**********************************'
+
+def slurpedResult = new JsonSlurper().parse(spotbugSarifFile)
+
+def results = slurpedResult.runs.results[0]
+
+for (result in slurpedResult.runs.results[0]) {
+
+ for (loc in result.locations) {
+ String location = loc.physicalLocation.artifactLocation.uri
+ //Making sure that the path was expanded
+ assert location.contains("src/it-src/test/java")
+ }
+}
+
+
+println "BugInstance size is ${results.size()}"
+
+
+assert results.size() > 0
\ No newline at end of file
diff --git a/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy b/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
index 86c8daa32..7ec02aba5 100644
--- a/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
+++ b/src/main/groovy/org/codehaus/mojo/spotbugs/SourceFileIndexer.groovy
@@ -45,7 +45,7 @@ class SourceFileIndexer {
protected void buildListSourceFiles(MavenProject project, MavenSession session) {
//String basePath = project.basedir.absolutePath
- String basePath = session.getExecutionRootDirectory()
+ String basePath = normalizePath(session.getExecutionRootDirectory())
def allSourceFiles = new ArrayList<>()
//Resource
@@ -92,16 +92,20 @@ class SourceFileIndexer {
scanDirectory(child,files,baseDirectory);
}
else {
- if(child.canonicalPath.startsWith(baseDirectory)) {
+ String newSourceFile = normalizePath(child.canonicalPath)
+ if(newSourceFile.startsWith(baseDirectory)) {
//The project will not be at the root of our file system.
//It will most likely be stored in a work directory.
// /work/project-code-to-scan/src/main/java/File.java => src/main/java/File.java
// (Here baseDirectory is /work/project-code-to-scan/)
- String relativePath = Paths.get(baseDirectory).relativize(Paths.get(child.path))
+ String relativePath = Paths.get(baseDirectory).relativize(Paths.get(newSourceFile))
files.add(normalizePath(relativePath))
}
else {
- files.add(normalizePath(child.path))
+ //Use the full path instead:
+ //This will occurs in many cases including when the pom.xml is
+ // not in the same directory tree as the sources.
+ files.add(newSourceFile)
}
}
}
From 82b51ccb0d7520977d077a62244ef3b097f4e3e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 Aug 2021 19:01:30 +0000
Subject: [PATCH 0552/1013] Bump plexus-utils from 3.4.0 to 3.4.1
Bumps [plexus-utils](https://github.com/codehaus-plexus/plexus-utils) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/codehaus-plexus/plexus-utils/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-utils/compare/plexus-utils-3.4.0...plexus-utils-3.4.1)
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-utils
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c4185d0a8..fb6802de6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
2.1.01.1.0
- 3.4.0
+ 3.4.13.0.01.8
From b927a7da6e2509b09e5669f05ca9dcfb2fb54b91 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Aug 2021 19:01:47 +0000
Subject: [PATCH 0553/1013] Bump slf4jVersion from 2.0.0-alpha4 to 2.0.0-alpha5
Bumps `slf4jVersion` from 2.0.0-alpha4 to 2.0.0-alpha5.
Updates `jcl-over-slf4j` from 2.0.0-alpha4 to 2.0.0-alpha5
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha4...v_2.0.0-alpha5)
Updates `slf4j-simple` from 2.0.0-alpha4 to 2.0.0-alpha5
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha4...v_2.0.0-alpha5)
Updates `slf4j-api` from 2.0.0-alpha4 to 2.0.0-alpha5
- [Release notes](https://github.com/qos-ch/slf4j/releases)
- [Commits](https://github.com/qos-ch/slf4j/compare/v_2.0.0-alpha4...v_2.0.0-alpha5)
---
updated-dependencies:
- dependency-name: org.slf4j:jcl-over-slf4j
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-simple
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.slf4j:slf4j-api
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fb6802de6..607746bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
5.7.24.4.04.3.0
- 2.0.0-alpha4
+ 2.0.0-alpha51.10.113.0.8
From 1f6c7feba3bd4a081e7af2cddc14a813891bcc07 Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Tue, 31 Aug 2021 08:50:12 -0400
Subject: [PATCH 0554/1013] SARIF integration test 2: More verbose error
message when assertion is failing
---
src/it/sarif-2/verify.groovy | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/it/sarif-2/verify.groovy b/src/it/sarif-2/verify.groovy
index ed3ab444f..518b14d96 100644
--- a/src/it/sarif-2/verify.groovy
+++ b/src/it/sarif-2/verify.groovy
@@ -27,6 +27,11 @@ println '**********************************'
println "Checking SARIF file"
println '**********************************'
+
+def String normalizePath(String path) {
+ return path.replaceAll("\\\\","/");
+}
+
def slurpedResult = new JsonSlurper().parse(spotbugSarifFile)
def results = slurpedResult.runs.results[0]
@@ -34,9 +39,9 @@ def results = slurpedResult.runs.results[0]
for (result in slurpedResult.runs.results[0]) {
for (loc in result.locations) {
- String location = loc.physicalLocation.artifactLocation.uri
+ String location = normalizePath(loc.physicalLocation.artifactLocation.uri)
//Making sure that the path was expanded
- assert location.contains("src/it-src/test/java")
+ assert location.contains("src/it-src/test/java") : "$location does not contain 'src/it-src/test/java'"
}
}
From eff7162ea69d61c08e86210b8ecff82f3010e5df Mon Sep 17 00:00:00 2001
From: Philippe Arteau
Date: Tue, 31 Aug 2021 10:31:46 -0400
Subject: [PATCH 0555/1013] Adjust assert to support the path
'spotbugsTestCases/src/java/AbstractMissingHashCode.java'
---
src/it/sarif-2/verify.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/it/sarif-2/verify.groovy b/src/it/sarif-2/verify.groovy
index 518b14d96..a41a8c0a8 100644
--- a/src/it/sarif-2/verify.groovy
+++ b/src/it/sarif-2/verify.groovy
@@ -41,7 +41,7 @@ for (result in slurpedResult.runs.results[0]) {
for (loc in result.locations) {
String location = normalizePath(loc.physicalLocation.artifactLocation.uri)
//Making sure that the path was expanded
- assert location.contains("src/it-src/test/java") : "$location does not contain 'src/it-src/test/java'"
+ assert location.contains("src/it-src/test/java") || location.contains("src/java") : "$location does not contain 'src/it-src/test/java'"
}
}
From 6a8cf274c851d3bd1d54fce812de8505c45b5d5a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Sep 2021 19:01:51 +0000
Subject: [PATCH 0556/1013] Bump groovyVersion from 3.0.8 to 3.0.9
Bumps `groovyVersion` from 3.0.8 to 3.0.9.
Updates `groovy` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-ant` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-dateutil` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-docgenerator` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-groovydoc` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-templates` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-xml` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-json` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
Updates `groovy-all` from 3.0.8 to 3.0.9
- [Release notes](https://github.com/apache/groovy/releases)
- [Commits](https://github.com/apache/groovy/commits)
---
updated-dependencies:
- dependency-name: org.codehaus.groovy:groovy:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-ant:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-dateutil:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-docgenerator:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-groovydoc:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-templates:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-xml:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-json:indy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.codehaus.groovy:groovy-all
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 607746bda..49acbf23c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
2.0.0-alpha51.10.11
- 3.0.8
+ 3.0.91.101.10
From a13710d0277a65e2ce70a9d31b28583eddf859dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Sep 2021 19:02:15 +0000
Subject: [PATCH 0557/1013] Bump maven-javadoc-plugin from 3.3.0 to 3.3.1
Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/apache/maven-javadoc-plugin/releases)
- [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.3.0...maven-javadoc-plugin-3.3.1)
---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-javadoc-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 49acbf23c..7872dde26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
1.12.13.1.23.2.2
- 3.3.0
+ 3.3.13.6.11.11.33.9.1
From c6e767bad391fc736a82728ff31504c1010d6e63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Sep 2021 19:01:26 +0000
Subject: [PATCH 0558/1013] Bump spotbugs from 4.4.0 to 4.4.1
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.4.0...4.4.1)
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7872dde26..a97331231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.7.2
- 4.4.0
+ 4.4.14.3.02.0.0-alpha5
From febf924641a1f006bc6b424321b6bad42abfc2f6 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 10 Sep 2021 22:24:23 -0400
Subject: [PATCH 0559/1013] [pom] Bump spotbugs to 4.4.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a97331231..5e09e91ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.3.1-SNAPSHOT
+ 4.4.1-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -122,7 +122,7 @@
5.7.24.4.1
- 4.3.0
+ 4.4.12.0.0-alpha51.10.11
From 39d9fc641b99c9df7c567451abda5e5d4f9f8eab Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Fri, 10 Sep 2021 22:29:57 -0400
Subject: [PATCH 0560/1013] Create codeql-analysis.yml
---
.github/workflows/codeql-analysis.yml | 71 +++++++++++++++++++++++++++
1 file changed, 71 insertions(+)
create mode 100644 .github/workflows/codeql-analysis.yml
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..f23c2484d
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ spotbugs ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ spotbugs ]
+ schedule:
+ - cron: '27 0 * * 3'
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'java' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+ # Learn more:
+ # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v2
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v1
+ with:
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v1
+
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 https://git.io/JvXDl
+
+ # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ #- run: |
+ # make bootstrap
+ # make release
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v1
From 915e5a027908d1ee01d87dcf1092c64a65096756 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 19:01:53 +0000
Subject: [PATCH 0561/1013] Bump jgit.version from 5.12.0.202106070339-r to
5.13.0.202109080827-r
Bumps `jgit.version` from 5.12.0.202106070339-r to 5.13.0.202109080827-r.
Updates `org.eclipse.jgit` from 5.12.0.202106070339-r to 5.13.0.202109080827-r
Updates `org.eclipse.jgit.ssh.jsch` from 5.12.0.202106070339-r to 5.13.0.202109080827-r
---
updated-dependencies:
- dependency-name: org.eclipse.jgit:org.eclipse.jgit
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.eclipse.jgit:org.eclipse.jgit.ssh.jsch
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5e09e91ee..6144a8c53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -175,7 +175,7 @@
4.0.47.4.7
- 5.12.0.202106070339-r
+ 5.13.0.202109080827-r9.2
From 34c1c995c0f8af3685b6f81f4cd12a5f00500700 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Sep 2021 19:01:40 +0000
Subject: [PATCH 0562/1013] Bump scmPluginVersion from 1.11.3 to 1.12.0
Bumps `scmPluginVersion` from 1.11.3 to 1.12.0.
Updates `maven-scm-provider-jgit` from 1.11.3 to 1.12.0
Updates `maven-scm-plugin` from 1.11.3 to 1.12.0
- [Release notes](https://github.com/apache/maven-scm/releases)
- [Commits](https://github.com/apache/maven-scm/compare/maven-scm-1.11.3...maven-scm-1.12.0)
---
updated-dependencies:
- dependency-name: org.apache.maven.scm:maven-scm-provider-jgit
dependency-type: direct:production
update-type: version-update:semver-minor
- dependency-name: org.apache.maven.plugins:maven-scm-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6144a8c53..89d90e37a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
3.2.23.3.13.6.1
- 1.11.3
+ 1.12.03.9.13.62.8.1
From c8c8a689788a252bfeab6f323995e9ff2ce6dcd8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Sep 2021 18:25:01 -0400
Subject: [PATCH 0563/1013] [maven] Bump maven wrapper to 3.8.2
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 642d572ce..abd303b67 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
From 4dacc01757f654035fb0b73a13fc2fe8dace83d5 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Sep 2021 18:25:09 -0400
Subject: [PATCH 0564/1013] [pom] Bump junit to 5.8.0
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 89d90e37a..877580154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
${project.version}
- 5.7.2
+ 5.8.04.4.14.4.12.0.0-alpha5
From 741f662a0d32ca1d4307d5bf47f75424893104ff Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Sep 2021 18:27:21 -0400
Subject: [PATCH 0565/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.4.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 877580154..b1e9305c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.1-SNAPSHOT
+ 4.4.1maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.4.1GitHub Issues
From 555c6a70854436539567be64187a9f8949a7e47e Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 19 Sep 2021 18:27:25 -0400
Subject: [PATCH 0566/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b1e9305c5..452e5cdc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.1
+ 4.4.2-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.4.1
+ HEADGitHub Issues
From 34e8c2a1eafc7eb2c1e52950b4ac03b255f9d726 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Sep 2021 19:02:01 +0000
Subject: [PATCH 0567/1013] Bump gmavenplus-plugin from 1.12.1 to 1.13.0
Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.12.1 to 1.13.0.
- [Release notes](https://github.com/groovy/GMavenPlus/releases)
- [Commits](https://github.com/groovy/GMavenPlus/compare/1.12.1...1.13.0)
---
updated-dependencies:
- dependency-name: org.codehaus.gmavenplus:gmavenplus-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 452e5cdc3..8856f9ab9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -144,7 +144,7 @@
3.0.01.80.22-1
- 1.12.1
+ 1.13.03.1.23.2.23.3.1
From 995228f7d834fed442e0fecf360f3eaf70df43c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 19:02:00 +0000
Subject: [PATCH 0568/1013] Bump plexus-resources from 1.1.0 to 1.2.0
Bumps [plexus-resources](https://github.com/codehaus-plexus/plexus-resources) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/codehaus-plexus/plexus-resources/releases)
- [Commits](https://github.com/codehaus-plexus/plexus-resources/compare/plexus-resources-1.1.0...plexus-resources-1.2.0)
---
updated-dependencies:
- dependency-name: org.codehaus.plexus:plexus-resources
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8856f9ab9..24355d86f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
3.8.22.1.0
- 1.1.0
+ 1.2.03.4.13.0.0
From 0f0eb0460296cb01625047576ffb1611e60ae6c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 19:02:06 +0000
Subject: [PATCH 0569/1013] Bump maven-core from 3.8.2 to 3.8.3
Bumps [maven-core](https://github.com/apache/maven) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-core
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8856f9ab9..062de3240 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,7 +131,7 @@
1.101.10
- 3.8.2
+ 3.8.30.13.13.03.0.0
From a41e00aac469a77f025ab02d6cb534266937ccbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Oct 2021 19:02:15 +0000
Subject: [PATCH 0570/1013] Bump mavenVersion from 3.8.2 to 3.8.3
Bumps `mavenVersion` from 3.8.2 to 3.8.3.
Updates `maven-plugin-api` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)
Updates `maven-artifact` from 3.8.2 to 3.8.3
- [Release notes](https://github.com/apache/maven/releases)
- [Commits](https://github.com/apache/maven/compare/maven-3.8.2...maven-3.8.3)
---
updated-dependencies:
- dependency-name: org.apache.maven:maven-plugin-api
dependency-type: direct:production
update-type: version-update:semver-patch
- dependency-name: org.apache.maven:maven-artifact
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8856f9ab9..5eb59bc81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
0.13.13.03.0.0
- 3.8.2
+ 3.8.32.1.01.1.0
From e1ec3346cc6d1248afaf30286df13ba658a82454 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Oct 2021 19:02:01 +0000
Subject: [PATCH 0571/1013] Bump spotbugs from 4.4.1 to 4.4.2
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.4.1 to 4.4.2.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.4.1...4.4.2)
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 22e4f1cdd..896bbfec4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
${project.version}5.8.0
- 4.4.1
+ 4.4.24.4.12.0.0-alpha5
From 7375bb02ddf491226a20539e336f18ffc14163a9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:05:28 -0400
Subject: [PATCH 0572/1013] [pom] Bump base parent to 29
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 896bbfec4..65d8ca2b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 28
+ 29
From 6079393cd1a3631f076150b07e5467f5e910bd33 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:05:36 -0400
Subject: [PATCH 0573/1013] [pom] Bump junit to 5.8.1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 65d8ca2b2..0fc5ca680 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
${project.version}
- 5.8.0
+ 5.8.14.4.24.4.12.0.0-alpha5
From ff9d8c55b8bbe9c50f6564896b3b5d0bb81b08d1 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:05:45 -0400
Subject: [PATCH 0574/1013] [pom] Bump spotbugs tag to 4.4.2
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0fc5ca680..56058fd44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
5.8.14.4.2
- 4.4.1
+ 4.4.22.0.0-alpha51.10.11
From 9004f5240812bf27e05e28f591ebedff83391017 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:08:21 -0400
Subject: [PATCH 0575/1013] [maven] Bump to 3.8.3
---
.mvn/wrapper/maven-wrapper.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index abd303b67..a9f1ef87b 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.2/apache-maven-3.8.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.3/apache-maven-3.8.3-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
From a71eea9b92e6c4a9cafed6b4366ffea7209cde88 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:08:33 -0400
Subject: [PATCH 0576/1013] [actions] Replace jdk 16 with 17 and 18-ea
---
.github/workflows/ci.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 736e89164..757725358 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
- java: [8, 11, 16]
+ java: [8, 11, 17, 18-ea]
fail-fast: false
max-parallel: 4
name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
From d2ede7f4c3ec379b5e70e4d8e9270df725924f09 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:16:24 -0400
Subject: [PATCH 0577/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.4.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 56058fd44..725ccc6c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2-SNAPSHOT
+ 4.4.2maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.4.2GitHub Issues
From a277cb34010d39d81e07693addd334c39987622b Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Wed, 13 Oct 2021 20:16:28 -0400
Subject: [PATCH 0578/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 725ccc6c8..51250a526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2
+ 4.4.3-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.4.2
+ HEADGitHub Issues
From 4bfe64e837daa8378963bd1cfd5fedf84f9210c8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:24:35 -0400
Subject: [PATCH 0579/1013] [pom] Change version number to allow for patches
since this wraps spotbugs
While spotbugs uses semantic versioning, us doing the same does not allow for any patches. Using this style with one extra position allows us to patch. It will most often be .0 but in this first case, I need to release a patch to patch vulnerable library usage.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 51250a526..c1d05aa6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.3-SNAPSHOT
+ 4.4.2.1-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
From 6a0fd8bddd894743ac189a1a8c32c2a603463ecb Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:25:30 -0400
Subject: [PATCH 0580/1013] [pom] Require maven 3.3.9
This most likely actually requires even newer, but still stating 3.2.5 which is extremely old is not ideal. No one really should use less than 3.8.1 due to vulnerabilities anyways. So this is not exactly what we want yet but is moving it forwards to block attempted old usage we don't even test for.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c1d05aa6c..9b1210ec9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,7 +87,7 @@
- 3.2.5
+ 3.3.9
From 95176c4a15f8ee0cbf3abbfb1bf93c39661a2fd8 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:35:10 -0400
Subject: [PATCH 0581/1013] [pom] Override maven-common-artifact-filters to
3.2.0
---
pom.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9b1210ec9..0f20dfadf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,6 +133,7 @@
3.8.30.13.1
+ 3.2.03.03.0.03.8.3
@@ -151,7 +152,7 @@
3.6.11.12.03.9.1
- 3.6
+ 3.62.8.1false
@@ -390,6 +391,11 @@
+
+ org.apache.maven.shared
+ maven-common-artifact-filters
+ ${mavenCommonArtifactFilters}
+ org.apache.maven
From 06a2e8b83a5649c3c3d087d66f541895e0fd5414 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:40:45 -0400
Subject: [PATCH 0582/1013] [pom] Override commons lang2 to 2.6
---
pom.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f20dfadf..3b576b4df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
3.2.22.12.11.0
+ 2.63.12.0
@@ -385,10 +386,10 @@
maven-artifact-transfer${mavenTransferVersion}
-
- org.sonatype.sisu
- sisu-guice
-
+
+ org.sonatype.sisu
+ sisu-guice
+
@@ -509,6 +510,11 @@
commons-io${io.version}
+
+ commons-lang
+ commons-lang
+ ${lang2.version}
+ org.apache.commonscommons-lang3
From bc67d6b48ef142b108395728ccda0e1b9588f057 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:41:02 -0400
Subject: [PATCH 0583/1013] [pom] Override maven shared utils to 3.3.4
others are vulnerable.
---
pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pom.xml b/pom.xml
index 3b576b4df..346c5cbe9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
1.103.8.3
+ 3.3.40.13.13.2.03.0
@@ -403,6 +404,11 @@
maven-core${mavenCoreVersion}
+
+ org.apache.maven.shared
+ maven-shared-utils
+ ${mavenSharedUtilsVersion}
+
From 9e2368119da25f2edcbd820bb25f18c716ddd5b5 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sat, 16 Oct 2021 23:41:40 -0400
Subject: [PATCH 0584/1013] [pom] Formatting
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 346c5cbe9..435a4db50 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,8 +458,8 @@
struts-core
- dom4j
- dom4j
+ dom4j
+ dom4jcommons-logging
From 20bbdd5e9630f423d9943a8ef46879c4b9a0efac Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 17 Oct 2021 00:05:07 -0400
Subject: [PATCH 0585/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.4.2.1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 435a4db50..e1e2e86ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2.1-SNAPSHOT
+ 4.4.2.1maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.4.2.1GitHub Issues
From 2b57e82ca7c5eadcde1f4479436ef53a1317f685 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Sun, 17 Oct 2021 00:05:11 -0400
Subject: [PATCH 0586/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e1e2e86ae..bcb27b58e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2.1
+ 4.4.2.2-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.4.2.1
+ HEADGitHub Issues
From cdcecc47ac78d4efa1f0beedc139e11b45ca4168 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Oct 2021 19:01:47 +0000
Subject: [PATCH 0587/1013] Bump ant from 1.10.11 to 1.10.12
Bumps ant from 1.10.11 to 1.10.12.
---
updated-dependencies:
- dependency-name: org.apache.ant:ant
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bcb27b58e..9acd94b24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
4.4.22.0.0-alpha5
- 1.10.11
+ 1.10.123.0.91.10
From 8c16d9704f00193c736d385b599496b64bb86880 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Thu, 21 Oct 2021 07:53:20 -0400
Subject: [PATCH 0588/1013] [pom] Update base parent without maven url
attributes that break older artifactory
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9acd94b24..b187a66bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
com.github.hazendazbase-parent
- 29
+ 30
From a00e29d56997b9f4247748355a549e837c304629 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Thu, 21 Oct 2021 07:54:19 -0400
Subject: [PATCH 0589/1013] [maven-release-plugin] prepare release
spotbugs-maven-plugin-4.4.2.2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index b187a66bc..3989f3542 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2.2-SNAPSHOT
+ 4.4.2.2maven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- HEAD
+ spotbugs-maven-plugin-4.4.2.2GitHub Issues
From ac416fe31ec0f0f7118f8f9022e120c55b6b2279 Mon Sep 17 00:00:00 2001
From: Jeremy Landis
Date: Thu, 21 Oct 2021 07:54:23 -0400
Subject: [PATCH 0590/1013] [maven-release-plugin] prepare for next development
iteration
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3989f3542..944ab7f5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
com.github.spotbugsspotbugs-maven-plugin
- 4.4.2.2
+ 4.4.2.3-SNAPSHOTmaven-pluginSpotBugs Maven Plugin
@@ -94,7 +94,7 @@
scm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.gitscm:git:ssh://git@github.com/spotbugs/spotbugs-maven-plugin.githttps://github.com/spotbugs/spotbugs-maven-plugin
- spotbugs-maven-plugin-4.4.2.2
+ HEADGitHub Issues
From 967ce4e4f53570ccff2e75214627826c932f685a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Nov 2021 19:01:42 +0000
Subject: [PATCH 0591/1013] Bump spotbugs from 4.4.2 to 4.5.0
Bumps [spotbugs](https://github.com/spotbugs/spotbugs) from 4.4.2 to 4.5.0.
- [Release notes](https://github.com/spotbugs/spotbugs/releases)
- [Changelog](https://github.com/spotbugs/spotbugs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/spotbugs/spotbugs/compare/4.4.2...4.5.0)
---
updated-dependencies:
- dependency-name: com.github.spotbugs:spotbugs
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 944ab7f5d..6f3e6fc39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@