Add since to methods/types scheduled for removal

The two `MarkerFactory#getMarker` methods were marked as deprecated
**before** the `2.0` release, therefore I find it safe to actually
remove them.

Author: ppkarwasz

log4j-api/src/main/java/org/apache/logging/log4j/Logger.java

@@ -17,7 +17,6 @@
 package org.apache.logging.log4j;
 
 import aQute.bnd.annotation.baseline.BaselineIgnore;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.Arrays;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -71,41 +70,6 @@ public static Marker getMarker(final String name) {
         return result;
     }
 
-    /**
-     * Retrieves or creates a Marker with the specified parent. The parent must have been previously created.
-     *
-     * @param name The name of the Marker.
-     * @param parent The name of the parent Marker.
-     * @return The Marker with the specified name.
-     * @throws IllegalArgumentException if the parent Marker does not exist.
-     * @deprecated Use the Marker add or set methods to add parent Markers. Will be removed by final GA release.
-     */
-    @Deprecated(forRemoval = true)
-    public static Marker getMarker(final String name, final String parent) {
-        final Marker parentMarker = MARKERS.get(parent);
-        if (parentMarker == null) {
-            throw new IllegalArgumentException("Parent Marker " + parent + " has not been defined");
-        }
-        return getMarker(name).addParents(parentMarker);
-    }
-
-    /**
-     * Retrieves or creates a Marker with the specified parent.
-     *
-     * @param name The name of the Marker.
-     * @param parent The parent Marker.
-     * @return The Marker with the specified name.
-     * @throws IllegalArgumentException if any argument is {@code null}
-     * @deprecated Use the Marker add or set methods to add parent Markers. Will be removed by final GA release.
-     */
-    @InlineMe(
-            replacement = "MarkerManager.getMarker(name).addParents(parent)",
-            imports = "org.apache.logging.log4j.MarkerManager")
-    @Deprecated(forRemoval = true)
-    public static Marker getMarker(final String name, final Marker parent) {
-        return getMarker(name).addParents(parent);
-    }
-
     /**
      * <em>Consider this class private, it is only public to satisfy Jackson for XML and JSON IO.</em>
      * <p>

log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java

@@ -22,5 +22,5 @@
  *
  * @deprecated MessageFactory has default methods that implement all the methods that were here.
  */
-@Deprecated
+@Deprecated(forRemoval = true, since = "3.0")
 public abstract class AbstractMessageFactory implements MessageFactory {}

log4j-api/src/main/java/org/apache/logging/log4j/message/AbstractMessageFactory.java

@@ -21,7 +21,7 @@
  *
  * @deprecated use {@link ReusableMessage} directly
  */
-@Deprecated(since = "3.0.0")
+@Deprecated(forRemoval = true, since = "3.0")
 interface Clearable {
 
     /**

log4j-api/src/main/java/org/apache/logging/log4j/message/Clearable.java

@@ -22,5 +22,5 @@
  * @deprecated MessageFactory now contains all interface methods.
  * @since 2.6
  */
-@Deprecated
+@Deprecated(forRemoval = true, since = "3.0")
 public interface MessageFactory2 extends MessageFactory {}

log4j-api/src/main/java/org/apache/logging/log4j/message/MessageFactory2.java

@@ -37,7 +37,7 @@
  * @see <a href="http://logging.apache.org/log4j/2.x/manual/api.html">Log4j 2 API manual</a>
  */
 @Export
-@Version("2.23.0")
+@Version("3.0.0")
 package org.apache.logging.log4j;
 
 import org.osgi.annotation.bundle.Export;

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

@@ -24,5 +24,5 @@
  * @since 2.8
  * @deprecated use {@link ThreadContextMap} directly
  */
-@Deprecated(since = "3.0.0")
+@Deprecated(forRemoval = true, since = "3.0")
 public interface CleanableThreadContextMap extends ThreadContextMap2 {}

log4j-api/src/main/java/org/apache/logging/log4j/spi/CleanableThreadContextMap.java

@@ -637,7 +637,6 @@ void logIfEnabled(
      * @param msgSupplier A function, which when called, produces the desired log message.
      * @param t the exception to log, including its stack trace.
      */
-    @Deprecated(forRemoval = true)
     @SuppressWarnings("removal")
     void logIfEnabled(String fqcn, Level level, Marker marker, MessageSupplier msgSupplier, Throwable t);
 

log4j-api/src/main/java/org/apache/logging/log4j/spi/ExtendedLogger.java

@@ -24,5 +24,5 @@
  * @since 2.8
  * @deprecated use {@link ThreadContextMap} directly
  */
-@Deprecated(since = "3.0.0")
+@Deprecated(forRemoval = true, since = "3.0")
 public interface ObjectThreadContextMap extends CleanableThreadContextMap {}

log4j-api/src/main/java/org/apache/logging/log4j/spi/ObjectThreadContextMap.java

@@ -24,5 +24,5 @@
  * @since 2.7
  * @deprecated use {@link ThreadContextMap} directly
  */
-@Deprecated(since = "3.0.0")
+@Deprecated(forRemoval = true, since = "3.0")
 public interface ThreadContextMap2 extends ThreadContextMap {}