chore: log4j 2.20.0 (#1859)

Author: csviri

caffeine-bounded-cache-support/pom.xml

@@ -44,14 +44,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <version>${log4j.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

operator-framework-core/pom.xml

@@ -81,14 +81,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <version>${log4j.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 

operator-framework/pom.xml

@@ -72,14 +72,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
       <version>${log4j.version}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>

operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java

@@ -1,11 +1,5 @@
 package io.javaoperatorsdk.operator.config.runtime;
 
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.core.config.AppenderRef;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-import org.apache.logging.log4j.core.layout.PatternLayout;
-import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.jupiter.api.Test;
 
 import io.fabric8.kubernetes.client.CustomResource;
@@ -17,60 +11,13 @@
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.*;
 
 class DefaultConfigurationServiceTest {
 
   public static final String CUSTOM_FINALIZER_NAME = "a.custom/finalizer";
   final DefaultConfigurationService configurationService = DefaultConfigurationService.instance();
 
-  @Test
-  void attemptingToRetrieveAnUnknownControllerShouldLogWarning() {
-    final LoggerContext context = LoggerContext.getContext(false);
-    final PatternLayout layout = PatternLayout.createDefaultLayout(context.getConfiguration());
-    final ListAppender appender = new ListAppender("list", null, layout, false, false);
-
-    appender.start();
-
-    context.getConfiguration().addAppender(appender);
-
-    AppenderRef ref = AppenderRef.createAppenderRef("list", null, null);
-    final var loggerName = configurationService.getLoggerName();
-    LoggerConfig loggerConfig =
-        LoggerConfig.createLogger(
-            false,
-            Level.valueOf("info"),
-            loggerName,
-            "false",
-            new AppenderRef[] {ref},
-            null,
-            context.getConfiguration(),
-            null);
-    loggerConfig.addAppender(appender, null, null);
-
-    context.getConfiguration().addLogger(loggerName, loggerConfig);
-    context.updateLoggers();
-
-    try {
-      final var config =
-          configurationService
-              .getConfigurationFor(new NotAutomaticallyCreated(), false);
-
-      assertThat(config).isNull();
-      assertThat(appender.getMessages())
-          .hasSize(1)
-          .allMatch(m -> m.contains(NotAutomaticallyCreated.NAME) && m.contains("not found"));
-    } finally {
-      appender.stop();
-
-      context.getConfiguration().removeLogger(loggerName);
-      context.updateLoggers();
-    }
-  }
-
   @Test
   void returnsValuesFromControllerAnnotationFinalizer() {
     final var reconciler = new TestCustomReconciler();

pom.xml

@@ -46,7 +46,7 @@
         <junit.version>5.9.1</junit.version>
         <fabric8-client.version>6.5.1</fabric8-client.version>
         <slf4j.version>1.7.36</slf4j.version>
-        <log4j.version>2.19.0</log4j.version>
+        <log4j.version>2.20.0</log4j.version>
         <mokito.version>5.3.0</mokito.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
         <compile-testing.version>0.19</compile-testing.version>
@@ -159,12 +159,12 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-slf4j-impl</artifactId>
+                <artifactId>log4j-slf4j2-impl</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-core</artifactId>
+                <artifactId>log4j2-core</artifactId>
                 <version>${log4j.version}</version>
             </dependency>
 

sample-operators/leader-election/pom.xml

@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.takes</groupId>

sample-operators/mysql-schema/pom.xml

@@ -59,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

sample-operators/tomcat-operator/pom.xml

@@ -55,7 +55,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.takes</groupId>

sample-operators/webpage/pom.xml

@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
         </dependency>
         <dependency>
             <groupId>org.takes</groupId>