diff --git a/pom.xml b/pom.xml
index 56e5df5..04c56ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.74</version>
+        <version>4.76</version>
         <relativePath />
     </parent>
 
@@ -17,8 +17,6 @@
     <description>Parses the console log generated by a build</description>
 
     <properties>
-        <!-- TODO: remove once FindBugs issues are fixed -->
-        <spotbugs.failOnError>false</spotbugs.failOnError>
         <jenkins.version>2.387.3</jenkins.version>
         <!-- Maven Plugins -->
         <maven-release-plugin.version>2.5.1</maven-release-plugin.version>
@@ -38,7 +36,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.21.0</version>
+                <version>3.21.2</version>
                 <configuration>
                     <targetJdk>11</targetJdk>
                     <rulesets>
diff --git a/src/findbugs/excludesFilter.xml b/src/findbugs/excludesFilter.xml
deleted file mode 100644
index 6ddd604..0000000
--- a/src/findbugs/excludesFilter.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
- ~ The MIT License
- ~
- ~ Copyright (c) 2015, CloudBees, Inc.
- ~
- ~ Permission is hereby granted, free of charge, to any person obtaining a copy
- ~ of this software and associated documentation files (the "Software"), to deal
- ~ in the Software without restriction, including without limitation the rights
- ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- ~ copies of the Software, and to permit persons to whom the Software is
- ~ furnished to do so, subject to the following conditions:
- ~
- ~ The above copyright notice and this permission notice shall be included in
- ~ all copies or substantial portions of the Software.
- ~
- ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- ~ THE SOFTWARE.
- -->
-
-<FindBugsFilter>
-  <Match>
-    <Class name="~.*\.Messages"/>
-  </Match>
-</FindBugsFilter>
diff --git a/src/main/java/hudson/plugins/logparser/LogParserLogPart.java b/src/main/java/hudson/plugins/logparser/LogParserLogPart.java
index ad9c7eb..fe79309 100755
--- a/src/main/java/hudson/plugins/logparser/LogParserLogPart.java
+++ b/src/main/java/hudson/plugins/logparser/LogParserLogPart.java
@@ -26,7 +26,7 @@ public void setLogPartNum(final int logPartNum) {
     }
 
     public boolean isEmpty() {
-        return (lines[0] == null);
+        return lines[0] == null;
     }
 
 }
diff --git a/src/main/java/hudson/plugins/logparser/LogParserParser.java b/src/main/java/hudson/plugins/logparser/LogParserParser.java
index 8cac814..17dc153 100755
--- a/src/main/java/hudson/plugins/logparser/LogParserParser.java
+++ b/src/main/java/hudson/plugins/logparser/LogParserParser.java
@@ -116,7 +116,7 @@ public LogParserResult parseLog(final Run<?, ?> build) throws IOException, Inter
         }
 
         // Open console log for reading and all other files for writing
-        try (final BufferedWriter writer = new BufferedWriter(new FileWriter(parsedFilePath))) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(parsedFilePath))) {
 
             // Record writers to links files in hash
             writers.put(LogParserConsts.ERROR, new BufferedWriter(new FileWriter(
@@ -350,8 +350,8 @@ private void parseLogBody(final Run<?, ?> build, final BufferedWriter writer, fi
 
         // Read log file from start - line by line and apply the statuses as
         // found by the threads.
-        try (final InputStreamReader streamReader = new InputStreamReader(build.getLogInputStream(), charset);
-             final BufferedReader reader = new BufferedReader(streamReader)) {
+        try (InputStreamReader streamReader = new InputStreamReader(build.getLogInputStream(), charset);
+             BufferedReader reader = new BufferedReader(streamReader)) {
             String line;
             String status;
             int line_num = 0;
diff --git a/src/main/java/hudson/plugins/logparser/LogParserReader.java b/src/main/java/hudson/plugins/logparser/LogParserReader.java
index fd575f7..d380673 100755
--- a/src/main/java/hudson/plugins/logparser/LogParserReader.java
+++ b/src/main/java/hudson/plugins/logparser/LogParserReader.java
@@ -24,7 +24,7 @@ public synchronized LogParserLogPart readLogPart(final int threadNum) throws IOE
 
         int counter = 0;
         String line;
-        while (counter < numLines && ((line = reader.readLine()) != null)) {
+        while (counter < numLines && (line = reader.readLine()) != null) {
             lines[counter++] = line;
         }
         logger.log(Level.INFO, "Done reading log part " + logPartNum);
diff --git a/src/main/java/hudson/plugins/logparser/LogParserUtils.java b/src/main/java/hudson/plugins/logparser/LogParserUtils.java
index 74bf91c..57c6d13 100755
--- a/src/main/java/hudson/plugins/logparser/LogParserUtils.java
+++ b/src/main/java/hudson/plugins/logparser/LogParserUtils.java
@@ -24,16 +24,12 @@ public static String[] readParsingRules(final FilePath parsingRulesFile) throws
     }
 
     public static boolean skipParsingRule(final String parsingRule) {
-        boolean skip = false;
-        if (parsingRule == null || parsingRule.equals("")
-                || parsingRule.charAt(0) == '#'
-                || parsingRule.startsWith("\\s")
-                || parsingRule.startsWith("\r") || // Carriage return
-                parsingRule.contains("$header")) { // for now - disregard rules
-                                                   // with header in them
-            skip = true;
-        }
-        return skip;
+        return parsingRule == null || parsingRule.equals("")
+            || parsingRule.charAt(0) == '#'
+            || parsingRule.startsWith("\\s")
+            || parsingRule.startsWith("\r")      // Carriage return
+            || parsingRule.contains("$header");  // for now - disregard rules
+                                                 // with header in them
     }
 
     public static String standardizeStatus(final String status) {
@@ -75,10 +71,9 @@ public static CompiledPatterns compilePatterns(
                     final String ruleParts[] = parsingRule.split("\\s");
                     String regexp = ruleParts[1];
                     String tag = ruleParts[0];
-                    if (!LogParserConsts.LEGAL_STATUS.contains(tag.toUpperCase(Locale.ENGLISH))) {
-                        if (!Arrays.asList("OK", "END", "WARN").contains(tag.toUpperCase(Locale.ENGLISH))) {
-                            extraTags.add(tag);
-                        }
+                    if (!LogParserConsts.LEGAL_STATUS.contains(tag.toUpperCase(Locale.ENGLISH))
+                        && !Arrays.asList("OK", "END", "WARN").contains(tag.toUpperCase(Locale.ENGLISH))) {
+                        extraTags.add(tag);
                     }
 
                     final int firstDash = parsingRule.indexOf('/');
@@ -145,7 +140,7 @@ public static int getLinesPerThread() {
     }
 
     public static int countLines(final String filename) throws IOException {
-        try (final LineNumberReader reader = new LineNumberReader(new FileReader(filename))) {
+        try (LineNumberReader reader = new LineNumberReader(new FileReader(filename))) {
             int count = 0;
             while (reader.readLine() != null) {
                 // Read the whole file to count the lines.
diff --git a/src/main/java/hudson/plugins/logparser/LogParserWriter.java b/src/main/java/hudson/plugins/logparser/LogParserWriter.java
index 10f86f0..3d4f90e 100755
--- a/src/main/java/hudson/plugins/logparser/LogParserWriter.java
+++ b/src/main/java/hudson/plugins/logparser/LogParserWriter.java
@@ -1,6 +1,5 @@
 package hudson.plugins.logparser;
 
-import hudson.Functions;
 import jenkins.model.Jenkins;
 
 import java.io.BufferedReader;
@@ -36,7 +35,7 @@ public static void writeWrapperHtml(final String buildWrapperPath)
                 + "<a href='build.log'>build log</a>\n" + "</noframes>\n"
                 + "</frameset>\n";
 
-        try (final BufferedWriter writer = new BufferedWriter(new FileWriter(buildWrapperPath))) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(buildWrapperPath))) {
             writer.write(wrapperHtml);
         }
     }
@@ -57,7 +56,7 @@ public static void writeReferenceHtml(final String buildRefPath,
                 + "\t\telement.display == 'none' ? element.display='block' : element.display='none';\n"
                 + "\t}\n" + "</script>\n";
 
-        try (final BufferedWriter writer = new BufferedWriter(new FileWriter(buildRefPath))) {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(buildRefPath))) {
             // Hudson stylesheets
             writer.write(LogParserConsts.getHtmlOpeningTags());
             writer.write(refStart); // toggle links javascript
@@ -110,7 +109,7 @@ private static void writeLinks(final BufferedWriter writer,
         final String linkListCount = statusCount.get(status).toString();
 
         final String hudsonRoot = Jenkins.get().getRootUrl();
-        final String iconLocation = String.format("%s/plugin/log-parser/images/", jenkins.model.Jenkins.RESOURCE_PATH).substring(1);
+        final String iconLocation = String.format("%s/plugin/log-parser/images/", Jenkins.RESOURCE_PATH).substring(1);
 		
         final String styles = 
             "<style>\n" 
@@ -131,7 +130,7 @@ private static void writeLinks(final BufferedWriter writer,
         writer.write(linksStart);
 
         // Read the links file and insert here
-        try (final BufferedReader reader = new BufferedReader(new FileReader(linkFiles.get(status)))) {
+        try (BufferedReader reader = new BufferedReader(new FileReader(linkFiles.get(status)))) {
             final String summaryLine = "<br/>(SUMMARY_INT_HERE LINK_LIST_DISPLAY_STR in this section)<br/>";
 
             final String headerTemplateRegexp = "HEADER HERE:";
diff --git a/src/main/java/hudson/plugins/logparser/ReadWriteTextFile.java b/src/main/java/hudson/plugins/logparser/ReadWriteTextFile.java
index ca57c46..b825215 100755
--- a/src/main/java/hudson/plugins/logparser/ReadWriteTextFile.java
+++ b/src/main/java/hudson/plugins/logparser/ReadWriteTextFile.java
@@ -20,7 +20,7 @@ private ReadWriteTextFile() {
     static public String getContents(final File aFile) {
         final StringBuilder contents = new StringBuilder();
 
-        try (final BufferedReader input = new BufferedReader(new FileReader(aFile))) {
+        try (BufferedReader input = new BufferedReader(new FileReader(aFile))) {
             String line = null; // not declared within while loop
             while ((line = input.readLine()) != null) {
                 contents.append(line).append("\n");
@@ -55,7 +55,7 @@ static public void setContents(final File aFile, final String aContents)
         }
 
         // use buffering
-        try (final Writer output = new BufferedWriter(new FileWriter(aFile))) {
+        try (Writer output = new BufferedWriter(new FileWriter(aFile))) {
             // FileWriter always assumes default encoding is OK!
             output.write(aContents);
         }
diff --git a/src/spotbugs/excludesFilter.xml b/src/spotbugs/excludesFilter.xml
new file mode 100644
index 0000000..5cd5e96
--- /dev/null
+++ b/src/spotbugs/excludesFilter.xml
@@ -0,0 +1,38 @@
+<FindBugsFilter>
+  <!--
+    Exclusions in this section have been triaged and determined to be
+    false positives.
+  -->
+  <Match>
+    <Bug pattern="MS_MUTABLE_COLLECTION_PKGPROTECT" />
+    <Class name="hudson.plugins.logparser.LogParserConsts" />
+    <Or>
+      <Field name="LEGAL_STATUS" />
+      <Field name="STATUSES_WITH_SECTIONS_IN_LINK_FILES" />
+    </Or>
+  </Match>
+
+  <!--
+    Here lies technical debt. Exclusions in this section have not yet
+    been triaged. When working on this section, pick an exclusion to
+    triage, then:
+
+    - Add a @SuppressFBWarnings(value = "[...]", justification = "[...]")
+      annotation if it is a false positive.  Indicate the reason why
+      it is a false positive, then remove the exclusion from this
+      section.
+
+    - If it is not a false positive, fix the bug, then remove the
+      exclusion from this section.
+   -->
+  <Match>
+    <Bug pattern="DM_DEFAULT_ENCODING" />
+    <Or>
+      <Class name="hudson.plugins.logparser.LogParserParser" />
+      <Class name="hudson.plugins.logparser.LogParserResult" />
+      <Class name="hudson.plugins.logparser.LogParserUtils" />
+      <Class name="hudson.plugins.logparser.LogParserWriter" />
+      <Class name="hudson.plugins.logparser.ReadWriteTextFile" />
+    </Or>
+  </Match>
+</FindBugsFilter>