Move SuppressFBWarnings to an internal package

Author: vy

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

@@ -24,7 +24,7 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import org.apache.log4j.spi.ThrowableRenderer;
-import org.apache.logging.log4j.util.SuppressFBWarnings;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 
 /**
  * Default implementation of {@link ThrowableRenderer} using {@link Throwable#printStackTrace(PrintWriter)}.

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

@@ -26,7 +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;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 
 /**
  * FileAppender appends log events to a file.

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

@@ -34,10 +34,10 @@
 import org.apache.log4j.spi.ThrowableRenderer;
 import org.apache.log4j.spi.ThrowableRendererSupport;
 import org.apache.logging.log4j.core.appender.AsyncAppender;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 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

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

@@ -48,9 +48,9 @@
 import org.apache.log4j.spi.ThrowableRendererSupport;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.net.UrlConnectionFactory;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 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.

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

@@ -24,7 +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;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 
 /**
  * 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

@@ -17,7 +17,7 @@
 package org.apache.log4j.helpers;
 
 import java.io.File;
-import org.apache.logging.log4j.util.SuppressFBWarnings;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 
 /**
  * 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

@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.log4j.Level;
-import org.apache.logging.log4j.util.SuppressFBWarnings;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 
 /**
  * An extension of the Level class that provides support for java.util.logging Levels.

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

@@ -18,7 +18,7 @@
  * Log4j 1.x compatibility layer.
  */
 @Export
-@Version("2.20.3")
+@Version("2.26.0")
 package org.apache.log4j.helpers;
 
 import org.osgi.annotation.bundle.Export;

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

@@ -30,9 +30,9 @@
 import org.apache.logging.log4j.core.layout.AbstractStringLayout;
 import org.apache.logging.log4j.core.layout.ByteBufferDestination;
 import org.apache.logging.log4j.core.util.Transform;
+import org.apache.logging.log4j.internal.annotation.SuppressFBWarnings;
 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.

log4j-1.2-api/src/main/java/org/apache/log4j/package-info.java

@@ -18,7 +18,7 @@
  * Log4j 1.x compatibility layer.
  */
 @Export
-@Version("2.20.2")
+@Version("2.26.0")
 package org.apache.log4j;
 
 import org.osgi.annotation.bundle.Export;