This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit be99e0405998dbdc6c6bbbb8412c8780a0a64930
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Sat Jan 1 18:59:30 2022 +0000
FindBugs -> SpotBugs (rename)
---
BUILDING.txt | 16 +++----
build.properties.default | 18 ++++----
build.xml | 50 +++++++++++-----------
.../filter-false-positives.xml | 4 +-
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/BUILDING.txt b/BUILDING.txt
index 166ee1f..6ce5ab8 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -519,26 +519,26 @@ target. The command is:
ant -Dexecute.validate=true validate
-(8.2) FindBugs
+(8.2) SpotBugs
-NOTE: FindBugs is licensed under LGPL. Using Findbugs during Tomcat build is
+NOTE: SpotBugs is licensed under LGPL. Using SpotBugs during Tomcat build is
optional and is off by default.
See https://spotbugs.github.io/ for more information.
-To enable FindBugs, add the following property to build.properties file:
+To enable SpotBugs, add the following property to build.properties file:
- execute.findbugs=true
+ execute.spotbugs=true
-To compile Tomcat classes and generate a FindBugs report, call the
-"findbugs" target. For example:
+To compile Tomcat classes and generate a SpotBugs report, call the
+"spotbugs" target. For example:
cd ${tomcat.source}
- ant -Dexecute.findbugs=true findbugs
+ ant -Dexecute.spotbugs=true spotbugs
The report file by default is written to
- output/findbugs
+ output/spotbugs
(8.3) End-of-line conventions check
diff --git a/build.properties.default b/build.properties.default
index 66c9d08..211ed19 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -66,8 +66,8 @@ test.threads=1
# Enabling code coverage extends the time taken to run the tests by ~50%
test.coverage=false
-# Note the FindBugs is LGPL licensed
-execute.findbugs=false
+# Note the SpotBugs is LGPL licensed
+execute.spotbugs=false
# Some platforms (e.g. OSX El Capitan) require IPv4 to be the default for the
# multicast tests to work
@@ -282,13 +282,13 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
# ----- SpotBugs (originally FindBugs) -----
-findbugs.version=4.2.3
-findbugs.checksum.enabled=true
-findbugs.checksum.algorithm=MD5|SHA-1
-findbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
-findbugs.home=${base.path}/spotbugs-${findbugs.version}
-findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
-findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
+spotbugs.version=4.2.3
+spotbugs.checksum.enabled=true
+spotbugs.checksum.algorithm=MD5|SHA-1
+spotbugs.checksum.value=6eb4a01355a5770f02e136c80182baa6|37daf40c76f11f7ae31894ab8d8fefd7fcb9d07b
+spotbugs.home=${base.path}/spotbugs-${spotbugs.version}
+spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
+spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
# ----- bnd, version 5.3.0 or later -----
# ----- provides OSGI metadata for JARs -----
diff --git a/build.xml b/build.xml
index dc1260b..dbacea4 100644
--- a/build.xml
+++ b/build.xml
@@ -190,10 +190,10 @@
<property name="coverage.out" value="${tomcat.output}/coverage"/>
<property name="coverage.datafile" value="${coverage.out}/jacoco.exec"/>
- <!-- FindBugs settings -->
- <property name="findbugs.out" value="${tomcat.output}/findbugs"/>
- <property name="findbugs.report.format" value="html"/>
- <property name="findbugs.report.level" value="low"/>
+ <!-- SpotBugs settings -->
+ <property name="spotbugs.out" value="${tomcat.output}/spotbugs"/>
+ <property name="spotbugs.report.format" value="html"/>
+ <property name="spotbugs.report.level" value="low"/>
<!-- Workaround against http://bugs.sun.com/view_bug.do?bug_id=6202721 -->
<available file="/dev/urandom" property="test.jvmarg.egd"
value="-Djava.security.egd=file:/dev/./urandom"/>
@@ -2032,23 +2032,23 @@
</target>
- <target name="findbugs"
- if="${execute.findbugs}"
- depends="compile,download-findbugs">
+ <target name="spotbugs"
+ if="${execute.spotbugs}"
+ depends="compile,download-spotbugs">
- <path id="findbugs.classpath">
- <fileset file="${findbugs.jar}" />
+ <path id="spotbugs.classpath">
+ <fileset file="${spotbugs.jar}" />
</path>
- <taskdef classpathref="findbugs.classpath" name="findbugs"
classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
+ <taskdef classpathref="spotbugs.classpath" name="spotbugs"
classname="edu.umd.cs.findbugs.anttask.FindBugsTask"/>
- <mkdir dir="${findbugs.out}" />
+ <mkdir dir="${spotbugs.out}" />
- <findbugs home="${findbugs.home}"
- output="${findbugs.report.format}"
-
outputFile="${findbugs.out}/findbugs-report.${findbugs.report.format}"
- reportLevel="${findbugs.report.level}"
- excludeFilter="res/findbugs/filter-false-positives.xml" >
+ <spotbugs home="${spotbugs.home}"
+ output="${spotbugs.report.format}"
+
outputFile="${spotbugs.out}/spotbugs-report.${spotbugs.report.format}"
+ reportLevel="${spotbugs.report.level}"
+ excludeFilter="res/spotbugs/filter-false-positives.xml" >
<sourcePath path="${basedir}/java" />
<class location="${tomcat.classes}" />
<class location="${test.classes}" />
@@ -2056,7 +2056,7 @@
<fileset file="${jdt.jar}" />
<fileset file="${ant.core.lib}" />
</auxClasspath>
- </findbugs>
+ </spotbugs>
</target>
<target name="dist-prepare" depends="download-dist">
@@ -3239,16 +3239,16 @@ skip.installer property in build.properties" />
</target>
- <target name="download-findbugs"
- if="${execute.findbugs}"
- description="Download FindBugs" >
+ <target name="download-spotbugs"
+ if="${execute.spotbugs}"
+ description="Download SpotBugs" >
<antcall target="downloadgz">
- <param name="sourcefile" value="${findbugs.loc}"/>
- <param name="destfile" value="${findbugs.jar}"/>
- <param name="checksum.enabled" value="${findbugs.checksum.enabled}"/>
- <param name="checksum.algorithm" value="${findbugs.checksum.algorithm}"/>
- <param name="checksum.value" value="${findbugs.checksum.value}"/>
+ <param name="sourcefile" value="${spotbugs.loc}"/>
+ <param name="destfile" value="${spotbugs.jar}"/>
+ <param name="checksum.enabled" value="${spotbugs.checksum.enabled}"/>
+ <param name="checksum.algorithm" value="${spotbugs.checksum.algorithm}"/>
+ <param name="checksum.value" value="${spotbugs.checksum.value}"/>
</antcall>
</target>
diff --git a/res/findbugs/filter-false-positives.xml
b/res/spotbugs/filter-false-positives.xml
similarity index 99%
rename from res/findbugs/filter-false-positives.xml
rename to res/spotbugs/filter-false-positives.xml
index 38cc114..5779596 100644
--- a/res/findbugs/filter-false-positives.xml
+++ b/res/spotbugs/filter-false-positives.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<FindBugsFilter>
- <!-- Considered to be false positives -->
+ <!-- Considered to be false positives -->
<Match>
<!-- Generated by compiler -->
<Field name="~\$SWITCH_TABLE\$.*"/>
@@ -1571,7 +1571,7 @@
<!-- Example code -->
<Match>
- <!-- FindBugs assumes the container uses the values as is. Tomcat validates
+ <!-- SpotBugs assumes the container uses the values as is. Tomcat validates
them and escapes them as necessary to ensure they are safe. -->
<Class name="CookieExample" />
<Method name="doGet" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
