diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml index 5e7fa1e63ce..6c73c48d8d7 100644 --- a/.github/dependabot.yaml +++ b/.github/dependabot.yaml @@ -90,9 +90,6 @@ updates: registries: - maven-central ignore: - # `com.github.spotbugs:spotbugs-annotations:4.9.0` and onwards require Java 11 - - dependency-name: "com.github.spotbugs:spotbugs-annotations" - versions: [ "[4.9.0,)" ] # Jetty 10.x does not have an internal logging API - dependency-name: "org.eclipse.jetty:*" versions: [ "[10,)" ] diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java b/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java index 79129edbb34..7ed318a9205 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/DefaultThrowableRenderer.java @@ -16,7 +16,6 @@ */ package org.apache.log4j; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InterruptedIOException; import java.io.LineNumberReader; @@ -25,6 +24,7 @@ import java.io.StringWriter; import java.util.ArrayList; import org.apache.log4j.spi.ThrowableRenderer; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Default implementation of {@link ThrowableRenderer} using {@link Throwable#printStackTrace(PrintWriter)}. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java index 25b6edf77d2..562223e2d47 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/FileAppender.java @@ -16,7 +16,6 @@ */ package org.apache.log4j; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; @@ -27,6 +26,7 @@ import org.apache.log4j.helpers.LogLog; import org.apache.log4j.helpers.QuietWriter; import org.apache.log4j.spi.ErrorCode; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * FileAppender appends log events to a file. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java index 850ea52bd61..4a9594b3f43 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Hierarchy.java @@ -16,7 +16,6 @@ */ package org.apache.log4j; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; @@ -38,6 +37,7 @@ import org.apache.logging.log4j.spi.AbstractLoggerAdapter; import org.apache.logging.log4j.spi.LoggerContext; import org.apache.logging.log4j.util.StackLocatorUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; // WARNING This class MUST not have references to the Category or // WARNING RootCategory classes in its static initialization neither diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java index 647b86e5b92..b5b2b880e9a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/PropertyConfigurator.java @@ -16,7 +16,6 @@ */ package org.apache.log4j; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.io.InterruptedIOException; @@ -51,6 +50,7 @@ import org.apache.logging.log4j.core.net.UrlConnectionFactory; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.StackLocatorUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Configures Log4j from properties. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java index ce03ec2bc8a..76606755a2d 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/RollingFileAppender.java @@ -16,7 +16,6 @@ */ package org.apache.log4j; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.InterruptedIOException; @@ -25,6 +24,7 @@ import org.apache.log4j.helpers.LogLog; import org.apache.log4j.helpers.OptionConverter; import org.apache.log4j.spi.LoggingEvent; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * RollingFileAppender extends FileAppender to backup the log files when they reach a certain size. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/FileWatchdog.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/FileWatchdog.java index ecf686faf4f..6a44774f7a5 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/FileWatchdog.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/FileWatchdog.java @@ -16,8 +16,8 @@ */ package org.apache.log4j.helpers; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Checks every now and then that a certain file has not changed. If it has, then call the {@link #doOnChange} method. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java index f99ad0b8c7c..671981f3d3c 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/helpers/UtilLoggingLevel.java @@ -18,10 +18,10 @@ import static org.apache.logging.log4j.util.Strings.toRootUpperCase; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.List; import org.apache.log4j.Level; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * An extension of the Level class that provides support for java.util.logging Levels. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java index a508218b119..ce7ebf943b4 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/layout/Log4j1XmlLayout.java @@ -16,7 +16,6 @@ */ package org.apache.log4j.layout; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.PrintWriter; import java.io.StringWriter; import java.nio.charset.StandardCharsets; @@ -33,6 +32,7 @@ import org.apache.logging.log4j.core.util.Transform; import org.apache.logging.log4j.util.ReadOnlyStringMap; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Port of XMLLayout in Log4j 1.x. Provided for compatibility with existing Log4j 1 configurations. diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java index 5aff69da56f..216d90b629a 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/DOMConfigurator.java @@ -16,7 +16,6 @@ */ package org.apache.log4j.xml; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -43,6 +42,7 @@ import org.apache.logging.log4j.core.net.UrlConnectionFactory; import org.apache.logging.log4j.core.util.IOUtils; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.w3c.dom.Element; /** diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java index dd2a0312b06..22cf6eb544e 100644 --- a/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java +++ b/log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.log4j.xml; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InterruptedIOException; import java.util.HashMap; @@ -50,6 +49,7 @@ import org.apache.logging.log4j.core.filter.ThresholdFilter; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LoaderUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java index e95f1e9bb67..fbfb94c9cfc 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/TestLogger.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.test; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.ArrayList; @@ -28,6 +27,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.MessageFactory; import org.apache.logging.log4j.spi.AbstractLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java index 84c12b42109..56feee5a5a9 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/DirectoryCleaner.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.test.junit; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.Files; @@ -26,6 +25,7 @@ import java.nio.file.attribute.BasicFileAttributes; import java.util.Collection; import java.util.HashSet; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.junit.jupiter.api.extension.ExtensionContext; class DirectoryCleaner extends AbstractFileCleaner { diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java index 9a9500d53a6..0b7b17ff10e 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/FileCleaner.java @@ -16,13 +16,13 @@ */ package org.apache.logging.log4j.test.junit; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Collection; import java.util.HashSet; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.junit.jupiter.api.extension.ExtensionContext; class FileCleaner extends AbstractFileCleaner { diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java index e568e415130..9ad06914184 100644 --- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java +++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/SerialUtil.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.test.junit; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -27,6 +26,7 @@ import java.io.Serializable; import org.apache.logging.log4j.util.Constants; import org.apache.logging.log4j.util.FilteredObjectInputStream; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Utility class to facilitate serializing and deserializing objects. diff --git a/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerDateTest.java b/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerDateTest.java index 0978587692a..55cd1577832 100644 --- a/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerDateTest.java +++ b/log4j-api-test/src/test/java/org/apache/logging/log4j/status/StatusLoggerDateTest.java @@ -18,11 +18,11 @@ import static org.assertj.core.api.Assertions.assertThat; -import edu.umd.cs.findbugs.annotations.Nullable; import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Properties; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java index 1690893187f..44f116f40fc 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLogger.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.simple; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.PrintStream; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * This is the default logger that is used when no suitable logging implementation is available. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java index 55cced06f58..9b1e0568b41 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/simple/SimpleLoggerContext.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.simple; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.PrintStream; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.message.MessageFactory; @@ -26,6 +25,7 @@ import org.apache.logging.log4j.spi.LoggerContext; import org.apache.logging.log4j.spi.LoggerRegistry; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.jspecify.annotations.Nullable; /** diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java index ce23ff5aa9b..7e7b2b2c92a 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusConsoleListener.java @@ -18,13 +18,13 @@ import static java.util.Objects.requireNonNull; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.apache.logging.log4j.Level; +import org.jspecify.annotations.Nullable; /** * A {@link StatusListener} that writes to the console. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java index 1b0dcf31dee..4f480eb80ea 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusData.java @@ -19,8 +19,6 @@ import static java.util.Objects.requireNonNull; import static org.apache.logging.log4j.util.Chars.SPACE; -import edu.umd.cs.findbugs.annotations.Nullable; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.Serializable; @@ -28,6 +26,8 @@ import java.time.format.DateTimeFormatter; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.message.Message; +import org.apache.logging.log4j.util.SuppressFBWarnings; +import org.jspecify.annotations.Nullable; /** * The Status data. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java index 699dc66c8a7..118c3d92486 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/status/StatusLogger.java @@ -18,8 +18,6 @@ import static java.util.Objects.requireNonNull; -import edu.umd.cs.findbugs.annotations.Nullable; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -46,6 +44,8 @@ import org.apache.logging.log4j.message.ParameterizedNoReferenceMessageFactory; import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.util.Constants; +import org.apache.logging.log4j.util.SuppressFBWarnings; +import org.jspecify.annotations.Nullable; /** * Records events that occur in the logging system. diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java index acb4310c3c3..ca419166c67 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/PropertyFilePropertySource.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.net.URL; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java index 2b74606f081..12a3bd803a0 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ProviderUtil.java @@ -21,7 +21,6 @@ import aQute.bnd.annotation.Cardinality; import aQute.bnd.annotation.Resolution; import aQute.bnd.annotation.spi.ServiceConsumer; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.URL; import java.util.Collection; diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/SuppressFBWarnings.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/SuppressFBWarnings.java new file mode 100644 index 00000000000..42b8211570f --- /dev/null +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/SuppressFBWarnings.java @@ -0,0 +1,33 @@ +/* + * 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 + * + * 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. + */ +package org.apache.logging.log4j.util; + +/** + * Annotation to suppress SpotBugs warnings. + */ +@InternalApi +public @interface SuppressFBWarnings { + /** + * @return specific pattern names to suppress + */ + String[] value() default {}; + + /** + * @return optional comment why it should be suppressed + */ + String justification() default ""; +} diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/internal/SerializationUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/internal/SerializationUtil.java index 6180f47421f..819d50df001 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/internal/SerializationUtil.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/internal/SerializationUtil.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.util.internal; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -31,6 +30,7 @@ import java.util.List; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.FilteredObjectInputStream; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Provides methods to increase the safety of object serialization/deserialization. diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java index 70b93443287..ddce96f1604 100644 --- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java +++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/jetty/Log4j2Logger.java @@ -16,11 +16,11 @@ */ package org.apache.logging.log4j.appserver.jetty; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.spi.ExtendedLogger; import org.apache.logging.log4j.spi.LoggerContext; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.eclipse.jetty.util.log.AbstractLogger; import org.eclipse.jetty.util.log.Logger; diff --git a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java index 11817c66189..2487d0da9f1 100644 --- a/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java +++ b/log4j-appserver/src/main/java/org/apache/logging/log4j/appserver/tomcat/TomcatLogger.java @@ -18,7 +18,6 @@ import aQute.bnd.annotation.Resolution; import aQute.bnd.annotation.spi.ServiceProvider; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -27,6 +26,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.spi.ExtendedLogger; import org.apache.logging.log4j.spi.LoggerContext; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Implements the Log interface from Tomcat 8.5 and greater. diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/AvailablePortFinder.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/AvailablePortFinder.java index ffd7d0b2769..4b587e29b98 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/AvailablePortFinder.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/AvailablePortFinder.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.test; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.DatagramSocket; import java.net.ServerSocket; @@ -25,6 +24,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Finds currently available server ports. diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/GcFreeLoggingTestUtil.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/GcFreeLoggingTestUtil.java index ace41854670..b57acbdbb3d 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/GcFreeLoggingTestUtil.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/GcFreeLoggingTestUtil.java @@ -21,7 +21,6 @@ import com.google.monitoring.runtime.instrumentation.AllocationRecorder; import com.google.monitoring.runtime.instrumentation.Sampler; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.net.URL; import java.nio.charset.Charset; @@ -37,6 +36,7 @@ import org.apache.logging.log4j.ThreadContext; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.message.StringMapMessage; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Utility methods for the GC-free logging tests. diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender/db/jdbc/JdbcH2TestHelper.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender/db/jdbc/JdbcH2TestHelper.java index 95ee5330ca0..6ad0e16fcf3 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender/db/jdbc/JdbcH2TestHelper.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/appender/db/jdbc/JdbcH2TestHelper.java @@ -16,13 +16,13 @@ */ package org.apache.logging.log4j.core.test.appender.db.jdbc; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import org.apache.logging.log4j.core.appender.db.jdbc.AbstractConnectionSource; import org.apache.logging.log4j.core.appender.db.jdbc.ConnectionSource; +import org.apache.logging.log4j.util.SuppressFBWarnings; @SuppressFBWarnings("HARD_CODE_PASSWORD") public class JdbcH2TestHelper { diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AbstractExternalFileCleaner.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AbstractExternalFileCleaner.java index 4477b55da72..39c490371c2 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AbstractExternalFileCleaner.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/AbstractExternalFileCleaner.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.test.junit; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.PrintStream; @@ -28,6 +27,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.junit.Assert; import org.junit.rules.ExternalResource; diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/JdbcRule.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/JdbcRule.java index d6f76b4fa26..0cef9527893 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/JdbcRule.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/junit/JdbcRule.java @@ -16,13 +16,13 @@ */ package org.apache.logging.log4j.core.test.junit; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; import java.util.Objects; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.core.appender.db.jdbc.ConnectionSource; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/mock/MockTcpSyslogServer.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/mock/MockTcpSyslogServer.java index 7fecbe9ef81..462d87658a2 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/mock/MockTcpSyslogServer.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/mock/MockTcpSyslogServer.java @@ -16,11 +16,11 @@ */ package org.apache.logging.log4j.core.test.net.mock; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.net.ServerSocket; import java.net.Socket; +import org.apache.logging.log4j.util.SuppressFBWarnings; public class MockTcpSyslogServer extends MockSyslogServer { private final ServerSocket serverSocket; diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/ssl/TlsSyslogTestUtil.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/ssl/TlsSyslogTestUtil.java index bb3b7691b63..4f1cb79eab1 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/ssl/TlsSyslogTestUtil.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/net/ssl/TlsSyslogTestUtil.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.core.test.net.ssl; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.ArrayList; import java.util.Random; +import org.apache.logging.log4j.util.SuppressFBWarnings; @SuppressFBWarnings("PREDICTABLE_RANDOM") public class TlsSyslogTestUtil { diff --git a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp/SimpleSmtpServer.java b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp/SimpleSmtpServer.java index c02b115d22e..eb1c8e0b400 100644 --- a/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp/SimpleSmtpServer.java +++ b/log4j-core-test/src/main/java/org/apache/logging/log4j/core/test/smtp/SimpleSmtpServer.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.test.smtp; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -27,6 +26,7 @@ import java.util.Iterator; import java.util.List; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Dummy SMTP server for testing purposes. diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java index 619749eacf2..ebba3ba42fd 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderReconnectTest.java @@ -21,7 +21,6 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.fail; -import edu.umd.cs.findbugs.annotations.Nullable; import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -48,6 +47,7 @@ import org.apache.logging.log4j.core.net.ssl.SslKeyStoreConstants; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.junit.UsingStatusListener; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.CleanupMode; import org.junit.jupiter.api.io.TempDir; diff --git a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java index 3437f787b8a..d421d58c3aa 100644 --- a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java +++ b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/xml/XmlConfigurationPropsTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import edu.umd.cs.findbugs.annotations.Nullable; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.test.junit.LoggerContextSource; @@ -31,6 +30,7 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.test.junit.SetTestProperty; import org.apache.logging.log4j.test.junit.UsingStatusLoggerMock; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java index 6db471cb87a..6dbecb12105 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java @@ -19,7 +19,6 @@ import static org.apache.logging.log4j.core.jmx.internal.JmxUtil.isJmxDisabled; import static org.apache.logging.log4j.core.util.ShutdownCallbackRegistry.SHUTDOWN_HOOK_MARKER; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -61,6 +60,7 @@ import org.apache.logging.log4j.spi.ThreadContextMapFactory; import org.apache.logging.log4j.util.LoaderUtil; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.jspecify.annotations.Nullable; /** diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java index 75f933790d4..cc70e820c83 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/FileManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -44,6 +43,7 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.core.util.FileUtils; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Manages actual File I/O for File Appenders. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java index 6a49f181c4c..53a4b60b96e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -36,6 +35,7 @@ import org.apache.logging.log4j.core.net.ssl.LaxHostnameVerifier; import org.apache.logging.log4j.core.net.ssl.SslConfiguration; import org.apache.logging.log4j.core.util.IOUtils; +import org.apache.logging.log4j.util.SuppressFBWarnings; public class HttpURLConnectionManager extends HttpManager { diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java index 54ac2aace98..f6143e8e834 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcDatabaseManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.db.jdbc; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Reader; import java.io.Serializable; import java.io.StringReader; @@ -58,6 +57,7 @@ import org.apache.logging.log4j.util.IndexedReadOnlyStringMap; import org.apache.logging.log4j.util.ReadOnlyStringMap; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * An {@link AbstractDatabaseManager} implementation for relational databases accessed via JDBC. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java index 6bc352b993f..531685a8784 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/AbstractRolloverStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.nio.file.DirectoryStream; @@ -36,6 +35,7 @@ import org.apache.logging.log4j.core.pattern.NotANumber; import org.apache.logging.log4j.core.util.Integers; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java index 969e37f5812..72bc08f0f7e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DefaultRolloverStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -44,6 +43,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.util.Integers; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * When rolling over, DefaultRolloverStrategy renames files according to an algorithm as described below. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java index 7694ce48a48..b3da2822ffc 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/DirectWriteRolloverStrategy.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -43,6 +42,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.util.Integers; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * When rolling over, DirectWriteRolloverStrategy writes directly to the file as resolved by the file diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java index a7622b2c5f8..a7ece15a048 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/FileExtension.java @@ -16,13 +16,13 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.util.Objects; import org.apache.logging.log4j.core.appender.rolling.action.Action; import org.apache.logging.log4j.core.appender.rolling.action.CommonsCompressAction; import org.apache.logging.log4j.core.appender.rolling.action.GzCompressAction; import org.apache.logging.log4j.core.appender.rolling.action.ZipCompressAction; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Enumerates over supported file extensions for compression. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java index 8be7dd4f9c4..25fdd59265b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -49,6 +48,7 @@ import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.core.util.Log4jThreadFactory; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * The Rolling File Manager. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java index bd41ce31c7a..ee1532ca31e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingRandomAccessFileManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.core.util.NullOutputStream; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Extends RollingFileManager but instead of using a buffered output stream, this class uses a {@code ByteBuffer} and a diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java index 54f406ec8c3..7301fc0dc20 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.core.Core; @@ -26,6 +25,7 @@ import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute; import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory; import org.apache.logging.log4j.core.util.Integers; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Rolls a file over based on time. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java index c8d251f672f..23fa43457cc 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling.action; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.file.FileVisitOption; import java.nio.file.FileVisitor; @@ -30,6 +29,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import org.apache.logging.log4j.core.lookup.StrSubstitutor; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Abstract action for processing files that are accepted by the specified PathFilters. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java index e7bb2376db7..4fe4f48e57b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/FileRenameAction.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling.action; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -25,6 +24,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * File rename action. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java index 51e038f1c13..f9fa781f9de 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/PosixViewAttributeAction.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.appender.rolling.action; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.FileVisitor; @@ -40,6 +39,7 @@ import org.apache.logging.log4j.core.lookup.StrSubstitutor; import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * File POSIX attribute view action. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java index 92d351e2de9..8adcde2d614 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.async; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Arrays; import java.util.List; import java.util.concurrent.TimeUnit; @@ -40,6 +39,7 @@ import org.apache.logging.log4j.core.util.Booleans; import org.apache.logging.log4j.spi.AbstractLogger; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Asynchronous Logger object that is created via configuration and can be diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java index d6143cdc158..6ba0096d201 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -41,6 +40,7 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.Constants; import org.apache.logging.log4j.util.LoaderUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Represents the source for the logging configuration. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java index bf039a2dafc..03ff310869d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/builder/impl/DefaultConfigurationBuilder.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config.builder.impl; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.OutputStream; import java.io.StringReader; @@ -62,6 +61,7 @@ import org.apache.logging.log4j.core.config.builder.api.ScriptFileComponentBuilder; import org.apache.logging.log4j.core.util.Integers; import org.apache.logging.log4j.core.util.Throwables; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * @param The BuiltConfiguration type. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java index 6c81224c2d6..1dd3425ca2d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/convert/TypeConverters.java @@ -18,7 +18,6 @@ import static org.apache.logging.log4j.util.Strings.toRootLowerCase; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.math.BigDecimal; import java.math.BigInteger; @@ -41,6 +40,7 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.Constants; import org.apache.logging.log4j.util.LoaderUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Collection of basic TypeConverter implementations. May be used to register additional TypeConverters or find diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java index 53a32a99edf..f58ef4c2727 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config.plugins.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -40,6 +39,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.wiring.BundleWiring; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java index 1a1c22835a7..31c43983e71 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/status/StatusConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config.status; -import edu.umd.cs.findbugs.annotations.Nullable; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.util.NetUtils; import org.apache.logging.log4j.status.StatusConsoleListener; import org.apache.logging.log4j.status.StatusLogger; +import org.jspecify.annotations.Nullable; /** * Configuration for setting up the {@link StatusLogger} fallback listener. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java index 6caeec59ae5..693ad03dc3c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.config.xml; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -46,6 +45,7 @@ import org.apache.logging.log4j.core.util.Loader; import org.apache.logging.log4j.core.util.Patterns; import org.apache.logging.log4j.core.util.Throwables; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java index 62ef3a596e0..9471acc8994 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MutableThreadContextMapFilter.java @@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.InputStream; import java.net.URI; @@ -52,6 +51,7 @@ import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.util.PerformanceSensitive; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Filter based on a value in the Thread Context Map (MDC). diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java index e91cb4c3884..9eb8ac6afe2 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jmx/LoggerContextAdmin.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.jmx; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.ByteArrayInputStream; @@ -47,6 +46,7 @@ import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Implementation of the {@code LoggerContextAdminMBean} interface. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java index 9889a6a7c2b..5490354ad96 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/GelfLayout.java @@ -19,7 +19,6 @@ import static org.apache.logging.log4j.util.Chars.LF; import static org.apache.logging.log4j.util.Chars.NUL; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -57,6 +56,7 @@ import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.StringBuilderFormattable; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.apache.logging.log4j.util.TriConsumer; /** diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java index 4debdfab722..fa8ef51a486 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/HtmlLayout.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.layout; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InterruptedIOException; import java.io.LineNumberReader; @@ -40,6 +39,7 @@ import org.apache.logging.log4j.core.pattern.DatePatternConverter; import org.apache.logging.log4j.core.util.Transform; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Outputs events as rows in an HTML table on an HTML page. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java index 2ff23cc38f9..091f3cac060 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MainMapLookup.java @@ -16,10 +16,10 @@ */ package org.apache.logging.log4j.core.lookup; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Map; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * A map-based lookup for main arguments. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java index 1aa2f5e18dd..f7bca3d3a31 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/JndiManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.net; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.net.URI; import java.net.URISyntaxException; import java.util.Properties; @@ -28,6 +27,7 @@ import org.apache.logging.log4j.core.appender.ManagerFactory; import org.apache.logging.log4j.core.util.JndiCloser; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Manages a JNDI {@link javax.naming.directory.DirContext}. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java index f44132df6df..076e6058d2d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SmtpManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.net; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -47,6 +46,7 @@ import org.apache.logging.log4j.core.util.CyclicBuffer; import org.apache.logging.log4j.core.util.NetUtils; import org.apache.logging.log4j.util.PropertiesUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Manager for sending SMTP events. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java index ac53c1b4a71..a56d2f8a6ea 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/TcpSocketManager.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.net; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.OutputStream; import java.io.Serializable; @@ -38,6 +37,7 @@ import org.apache.logging.log4j.core.util.Log4jThread; import org.apache.logging.log4j.core.util.NullOutputStream; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Manager of TCP Socket connections. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java index fe57d821d96..582704ea464 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/UrlConnectionFactory.java @@ -18,7 +18,6 @@ import static org.apache.logging.log4j.util.Strings.toRootLowerCase; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.net.HttpURLConnection; import java.net.JarURLConnection; @@ -37,6 +36,7 @@ import org.apache.logging.log4j.core.util.internal.SystemUtils; import org.apache.logging.log4j.util.PropertiesUtil; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Constructs an HTTPURLConnection. This class should be considered to be internal diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java index f2407a979b2..d0c6d62a706 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/FilePasswordProvider.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.net.ssl; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.CharBuffer; @@ -26,6 +25,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Arrays; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * PasswordProvider that reads password from a file. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java index 0068619c70c..869950764d8 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/LaxHostnameVerifier.java @@ -16,9 +16,9 @@ */ package org.apache.logging.log4j.core.net.ssl; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLSession; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * An HostnameVerifier which accepts everything. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java index 8f55ab48cba..f8e6f1a1491 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/script/ScriptFile.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.script; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -34,6 +33,7 @@ import org.apache.logging.log4j.core.util.FileUtils; import org.apache.logging.log4j.core.util.IOUtils; import org.apache.logging.log4j.core.util.NetUtils; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Container for the language and body of a script file along with the file location. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java index 873729a4bc5..43af8533a38 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/Generate.java @@ -16,12 +16,12 @@ */ package org.apache.logging.log4j.core.tools; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.PrintStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.apache.logging.log4j.core.util.Integers; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Generates source code for custom or extended logger wrappers. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java index 6c1dcbb9866..54a386ec61d 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java @@ -22,7 +22,6 @@ import static org.apache.logging.log4j.util.Strings.toRootLowerCase; import static org.apache.logging.log4j.util.Strings.toRootUpperCase; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.PrintStream; import java.lang.annotation.ElementType; @@ -74,6 +73,7 @@ import org.apache.logging.log4j.core.tools.picocli.CommandLine.Help.Ansi.Style; import org.apache.logging.log4j.core.tools.picocli.CommandLine.Help.Ansi.Text; import org.apache.logging.log4j.core.util.Integers; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** *

diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java index 5eb467d0bed..cfe16b900de 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/FileUtils.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.net.URI; @@ -35,6 +34,7 @@ import java.util.Set; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * File utilities. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java index c1f9c6d5a86..81dd9782e93 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java @@ -16,12 +16,12 @@ */ package org.apache.logging.log4j.core.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Objects; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java index 22286c636d5..044812f6723 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NetUtils.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.core.util; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.net.InetAddress; import java.net.MalformedURLException; @@ -33,6 +32,7 @@ import java.util.function.Function; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Networking-related convenience methods. diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java index 5a79ab8b9ab..a71799f4fa1 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Source.java @@ -18,7 +18,6 @@ import static java.util.Objects.requireNonNull; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -32,6 +31,7 @@ import org.apache.logging.log4j.core.config.ConfigurationSource; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.Strings; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java index 7c97d495ba4..b5bd7588f2c 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Throwables.java @@ -18,7 +18,6 @@ import static java.util.Objects.requireNonNull; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.InterruptedIOException; import java.io.LineNumberReader; @@ -29,6 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Helps with Throwable objects. diff --git a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Log4jBridgeHandler.java b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Log4jBridgeHandler.java index efc3e563987..4819b1c398b 100644 --- a/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Log4jBridgeHandler.java +++ b/log4j-jul/src/main/java/org/apache/logging/log4j/jul/Log4jBridgeHandler.java @@ -17,7 +17,6 @@ package org.apache.logging.log4j.jul; // note: NO import of Logger, Level, LogManager to prevent conflicts JUL/log4j -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.Enumeration; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.LoggerConfig; import org.apache.logging.log4j.spi.ExtendedLogger; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; /** * Bridge from JUL to log4j2.
diff --git a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java index 957326d9ad6..09136daa941 100644 --- a/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java +++ b/log4j-layout-template-json/src/main/java/org/apache/logging/log4j/layout/template/json/util/Uris.java @@ -18,7 +18,6 @@ import static org.apache.logging.log4j.util.Strings.toRootLowerCase; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -35,6 +34,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.status.StatusLogger; import org.apache.logging.log4j.util.LoaderUtil; +import org.apache.logging.log4j.util.SuppressFBWarnings; public final class Uris { diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml index 6328ac4c9b0..dcb10255a46 100644 --- a/log4j-parent/pom.xml +++ b/log4j-parent/pom.xml @@ -132,8 +132,6 @@ 1.1.2 4.14.0 3.6.0 - - 4.8.6 2.7.18 5.3.39 2.0.3 @@ -163,7 +161,6 @@ $[bnd-module-name];access=0;modules=" biz.aQute.bnd.annotation, com.google.errorprone.annotations, - com.github.spotbugs.annotations, org.osgi.annotation.bundle, org.osgi.annotation.versioning " @@ -877,13 +874,6 @@ provided - - com.github.spotbugs - spotbugs-annotations - ${spotbugs-annotations.version} - provided - - @@ -1124,11 +1114,6 @@ org.osgi.annotation.versioning ${osgi.annotation.versioning.version} - - com.github.spotbugs - spotbugs-annotations - ${spotbugs-annotations.version} - diff --git a/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java index 83a4d45672b..703e3d2b0fa 100644 --- a/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java +++ b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JdbcAppenderBenchmark.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.perf.jmh; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; diff --git a/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java index e58d7613b69..669394aaa98 100644 --- a/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java +++ b/log4j-perf-test/src/main/java/org/apache/logging/log4j/perf/jmh/JpaAppenderBenchmark.java @@ -16,7 +16,6 @@ */ package org.apache.logging.log4j.perf.jmh; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -30,6 +29,7 @@ import org.apache.logging.log4j.core.config.DefaultConfiguration; import org.apache.logging.log4j.core.util.Closer; import org.apache.logging.log4j.status.StatusLogger; +import org.apache.logging.log4j.util.SuppressFBWarnings; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode;