Skip to content

Commit 368e987

Browse files
committed
Remove spotbugs-annotations dependencies (#3984)
1 parent 4b7065b commit 368e987

File tree

82 files changed

+112
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+112
-99
lines changed

.github/dependabot.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,6 @@ updates:
9090
registries:
9191
- maven-central
9292
ignore:
93-
# `com.github.spotbugs:spotbugs-annotations:4.9.0` and onwards require Java 11
94-
- dependency-name: "com.github.spotbugs:spotbugs-annotations"
95-
versions: [ "[4.9.0,)" ]
9693
# Jetty 10.x does not have an internal logging API
9794
- dependency-name: "org.eclipse.jetty:*"
9895
versions: [ "[10,)" ]

log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.IOException;
2120
import java.io.InterruptedIOException;
2221
import java.io.LineNumberReader;
@@ -25,6 +24,7 @@
2524
import java.io.StringWriter;
2625
import java.util.ArrayList;
2726
import org.apache.log4j.spi.ThrowableRenderer;
27+
import org.apache.logging.log4j.util.SuppressFBWarnings;
2828

2929
/**
3030
* Default implementation of {@link ThrowableRenderer} using {@link Throwable#printStackTrace(PrintWriter)}.

log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.BufferedWriter;
2120
import java.io.File;
2221
import java.io.FileNotFoundException;
@@ -27,6 +26,7 @@
2726
import org.apache.log4j.helpers.LogLog;
2827
import org.apache.log4j.helpers.QuietWriter;
2928
import org.apache.log4j.spi.ErrorCode;
29+
import org.apache.logging.log4j.util.SuppressFBWarnings;
3030

3131
/**
3232
* FileAppender appends log events to a file.

log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.util.Enumeration;
2120
import java.util.Hashtable;
2221
import java.util.Vector;
@@ -38,6 +37,7 @@
3837
import org.apache.logging.log4j.spi.AbstractLoggerAdapter;
3938
import org.apache.logging.log4j.spi.LoggerContext;
4039
import org.apache.logging.log4j.util.StackLocatorUtil;
40+
import org.apache.logging.log4j.util.SuppressFBWarnings;
4141

4242
// WARNING This class MUST not have references to the Category or
4343
// WARNING RootCategory classes in its static initialization neither

log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.IOException;
2120
import java.io.InputStream;
2221
import java.io.InterruptedIOException;
@@ -51,6 +50,7 @@
5150
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
5251
import org.apache.logging.log4j.util.PropertiesUtil;
5352
import org.apache.logging.log4j.util.StackLocatorUtil;
53+
import org.apache.logging.log4j.util.SuppressFBWarnings;
5454

5555
/**
5656
* Configures Log4j from properties.

log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.File;
2120
import java.io.IOException;
2221
import java.io.InterruptedIOException;
@@ -25,6 +24,7 @@
2524
import org.apache.log4j.helpers.LogLog;
2625
import org.apache.log4j.helpers.OptionConverter;
2726
import org.apache.log4j.spi.LoggingEvent;
27+
import org.apache.logging.log4j.util.SuppressFBWarnings;
2828

2929
/**
3030
* RollingFileAppender extends FileAppender to backup the log files when they reach a certain size.

log4j-1.2-api/src/main/java/org/apache/log4j/helpers/FileWatchdog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
*/
1717
package org.apache.log4j.helpers;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.File;
20+
import org.apache.logging.log4j.util.SuppressFBWarnings;
2121

2222
/**
2323
* Checks every now and then that a certain file has not changed. If it has, then call the {@link #doOnChange} method.

log4j-1.2-api/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
import static org.apache.logging.log4j.util.Strings.toRootUpperCase;
2020

21-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2221
import java.util.ArrayList;
2322
import java.util.List;
2423
import org.apache.log4j.Level;
24+
import org.apache.logging.log4j.util.SuppressFBWarnings;
2525

2626
/**
2727
* An extension of the Level class that provides support for java.util.logging Levels.

log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j.layout;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.PrintWriter;
2120
import java.io.StringWriter;
2221
import java.nio.charset.StandardCharsets;
@@ -33,6 +32,7 @@
3332
import org.apache.logging.log4j.core.util.Transform;
3433
import org.apache.logging.log4j.util.ReadOnlyStringMap;
3534
import org.apache.logging.log4j.util.Strings;
35+
import org.apache.logging.log4j.util.SuppressFBWarnings;
3636

3737
/**
3838
* Port of XMLLayout in Log4j 1.x. Provided for compatibility with existing Log4j 1 configurations.

log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package org.apache.log4j.xml;
1818

19-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2019
import java.io.ByteArrayInputStream;
2120
import java.io.IOException;
2221
import java.io.InputStream;
@@ -43,6 +42,7 @@
4342
import org.apache.logging.log4j.core.net.UrlConnectionFactory;
4443
import org.apache.logging.log4j.core.util.IOUtils;
4544
import org.apache.logging.log4j.util.PropertiesUtil;
45+
import org.apache.logging.log4j.util.SuppressFBWarnings;
4646
import org.w3c.dom.Element;
4747

4848
/**

0 commit comments

Comments
 (0)