Removes support for EventData

The `org.slf4j.ext.EventData` class was a primitive equivalent of
Log4j's `StructuredDataMessage`. QOS.CH published CVE-2018-8088 against
this class and removed it from `slf4j-ext` version 1.7.26.

For a long time we kept support code to convert `EventData` to its Log4j
equivalent for compatibility's sake: users that relied on this class
could still use Log4j Core, but the functionality was **automatically**
disabled once they upgraded `slf4j-ext`.

Since 5 years passed since `slfj4-ext` 1.7.26 was published, we can
safely assume that all the users upgraded the library and the support
code can be removed.

Author: ppkarwasz

log4j-parent/pom.xml

@@ -150,8 +150,6 @@
     <pax-exam.version>4.13.5</pax-exam.version>
     <plexus-utils.version>3.5.1</plexus-utils.version>
     <slf4j.version>2.0.9</slf4j.version>
-    <!-- Last version before a breaking change -->
-    <slf4j-ext.version>1.7.25</slf4j-ext.version>
     <system-stubs.version>2.1.5</system-stubs.version>
     <tomcat-juli.version>10.1.16</tomcat-juli.version>
     <velocity.version>1.7</velocity.version>
@@ -815,7 +813,7 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-ext</artifactId>
-        <version>${slf4j-ext.version}</version>
+        <version>${slf4j.version}</version>
       </dependency>
 
       <dependency>

log4j-slf4j-impl/pom.xml

@@ -29,22 +29,7 @@
   <name>Apache Log4j SLF4J Binding</name>
   <description>The Apache Log4j SLF4J API binding to Log4j 2 Core</description>
   <properties>
-    <log4jParentDir>${basedir}/..</log4jParentDir>
-    <slf4j.version>1.7.25</slf4j.version>
-
-    <!--
-      ~ OSGi and JPMS options
-      -->
-    <bnd-extra-package-options>
-      <!-- Optional dependencies -->
-      org.slf4j.ext;resolution:=optional
-    </bnd-extra-package-options>
-    <bnd-extra-module-options>
-      <!-- Optional module -->
-      slf4j.ext;substitute="slf4j-ext";static=true;transitive=false,
-      <!-- Version 1.7.25 has not module name, but 1.7.36 does -->
-      org.slf4j;substitute="slf4j-api"
-    </bnd-extra-module-options>
+    <slf4j.version>1.7.36</slf4j.version>
   </properties>
   <dependencies>
     <dependency>
@@ -60,11 +45,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-ext</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
@@ -110,6 +90,11 @@
       <artifactId>junit-vintage-engine</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-ext</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>

log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/EventDataConverter.java

@@ -21,9 +21,7 @@
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.apache.logging.log4j.message.SimpleMessage;
 import org.apache.logging.log4j.spi.ExtendedLogger;
-import org.apache.logging.log4j.util.LoaderUtil;
 import org.slf4j.Marker;
-import org.slf4j.MarkerFactory;
 import org.slf4j.spi.LocationAwareLogger;
 
 /**
@@ -33,18 +31,13 @@ public class Log4jLogger implements LocationAwareLogger {
 
     public static final String FQCN = Log4jLogger.class.getName();
 
-    private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT");
-    private static final EventDataConverter CONVERTER = createConverter();
-
-    private final boolean eventLogger;
     private final ExtendedLogger logger;
     private final String name;
     private final Log4jMarkerFactory markerFactory;
 
     public Log4jLogger(final Log4jMarkerFactory markerFactory, final ExtendedLogger logger, final String name) {
         this.markerFactory = markerFactory;
         this.logger = logger;
-        this.eventLogger = "EventLogger".equals(name);
         this.name = name;
     }
 
@@ -364,10 +357,7 @@ public void log(
         }
         final Message msg;
         final Throwable actualThrowable;
-        if (CONVERTER != null && eventLogger && marker != null && marker.contains(EVENT_MARKER)) {
-            msg = CONVERTER.convertEvent(message, params, throwable);
-            actualThrowable = throwable != null ? throwable : msg.getThrowable();
-        } else if (params == null) {
+        if (params == null) {
             msg = new SimpleMessage(message);
             actualThrowable = throwable;
         } else {
@@ -382,15 +372,6 @@ public String getName() {
         return name;
     }
 
-    private static EventDataConverter createConverter() {
-        try {
-            LoaderUtil.loadClass("org.slf4j.ext.EventData");
-            return new EventDataConverter();
-        } catch (final ClassNotFoundException cnfe) {
-            return null;
-        }
-    }
-
     private static Level getLevel(final int i) {
         switch (i) {
             case TRACE_INT:

log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java

@@ -34,7 +34,7 @@ public void testCleanup() throws Exception {
         final Log4jLoggerFactory factory = (Log4jLoggerFactory) LoggerFactory.getILoggerFactory();
         factory.getLogger("test");
         Set<LoggerContext> set = factory.getLoggerContexts();
-        final LoggerContext ctx1 = set.toArray(new LoggerContext[0])[0];
+        final LoggerContext ctx1 = set.toArray(LoggerContext.EMPTY_ARRAY)[0];
         assertTrue("LoggerContext is not enabled for shutdown", ctx1 instanceof LifeCycle);
         ((LifeCycle) ctx1).stop();
         set = factory.getLoggerContexts();

log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerContextTest.java

@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
-import java.util.Locale;
 import org.apache.logging.log4j.core.LogEvent;
 import org.apache.logging.log4j.core.test.appender.ListAppender;
 import org.apache.logging.log4j.core.test.junit.LoggerContextRule;
@@ -34,8 +33,6 @@
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
 import org.slf4j.Marker;
-import org.slf4j.ext.EventData;
-import org.slf4j.ext.EventLogger;
 import org.slf4j.ext.XLogger;
 import org.slf4j.ext.XLoggerFactory;
 import org.slf4j.spi.LocationAwareLogger;
@@ -140,30 +137,12 @@ public void testRootLogger() {
     public void doubleSubst() {
         logger.debug("Hello, {}", "Log4j {}");
         verify("List", "o.a.l.s.LoggerTest Hello, Log4j {} MDC{}" + Strings.LINE_SEPARATOR);
+        // XLogger 1.7.x performs substitution twice:
+        // https://jira.qos.ch/browse/SLF4J-421
         xlogger.debug("Hello, {}", "Log4j {}");
         verify("List", "o.a.l.s.LoggerTest Hello, Log4j Log4j {} MDC{}" + Strings.LINE_SEPARATOR);
     }
 
-    @Test
-    public void testEventLogger() {
-        MDC.put("loginId", "JohnDoe");
-        MDC.put("ipAddress", "192.168.0.120");
-        MDC.put("locale", Locale.US.getDisplayName());
-        final EventData data = new EventData();
-        data.setEventType("Transfer");
-        data.setEventId("Audit@18060");
-        data.setMessage("Transfer Complete");
-        data.put("ToAccount", "123456");
-        data.put("FromAccount", "123457");
-        data.put("Amount", "200.00");
-        EventLogger.logEvent(data);
-        MDC.clear();
-        verify(
-                "EventLogger",
-                "o.a.l.s.LoggerTest Transfer [Audit@18060 Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete"
-                        + Strings.LINE_SEPARATOR);
-    }
-
     @Test
     public void testThrowable() {
         final Throwable expected = new RuntimeException();
@@ -228,6 +207,5 @@ public void cleanup() {
         MDC.clear();
         ctx.getListAppender("List").clear();
         ctx.getListAppender("UnformattedList").clear();
-        ctx.getListAppender("EventLogger").clear();
     }
 }

log4j-slf4j-impl/src/test/java/org/apache/logging/slf4j/LoggerTest.java

@@ -23,6 +23,7 @@
     <version>${revision}</version>
     <relativePath>../log4j-parent</relativePath>
   </parent>
+
   <artifactId>log4j-slf4j2-impl</artifactId>
   <packaging>jar</packaging>
   <name>Apache Log4j SLF4J 2.0 Binding</name>
@@ -105,7 +106,6 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-ext</artifactId>
-      <version>${slf4j.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>