Merge pull request #448 from axonivy/slf4j

XIVY-8973 Streamline slf4j version with Eclipse 2023-09 update
axonivy · Jul 2, 2024 · 6562ad9 · 6562ad9
2 parents 0ee6ce0 + 4702ea0
commit 6562ad9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
     <java.version>17</java.version>
     <maven.version>3.6.3</maven.version>
     <!-- version should match ivy Engine sfl4j version! And version in EngineClassLoaderFactory.SLF4J_VERSION -->
-    <slf4j.version>1.7.36</slf4j.version>
+    <slf4j.version>2.0.12</slf4j.version>
     <site.path>snapshot</site.path>
     <other.site.path>release</other.site.path>
     <other.site.name>Stable</other.site.name>

diff --git a/src/main/java/ch/ivyteam/ivy/maven/engine/EngineClassLoaderFactory.java b/src/main/java/ch/ivyteam/ivy/maven/engine/EngineClassLoaderFactory.java
@@ -54,7 +54,7 @@ public interface OsgiDir {
   }
 
   /** must match version in pom.xml */
-  private static final String SLF4J_VERSION = "1.7.36";
+  private static final String SLF4J_VERSION = "2.0.12";
 
   private static final List<String> ENGINE_LIB_DIRECTORIES = Arrays.asList(
           OsgiDir.INSTALL_AREA + "/" + OsgiDir.LIB_BOOT,

diff --git a/src/main/java/ch/ivyteam/ivy/maven/engine/Slf4jSimpleEngineProperties.java b/src/main/java/ch/ivyteam/ivy/maven/engine/Slf4jSimpleEngineProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Axon Ivy AG
+ * Copyright (C) 2024 Axon Ivy AG
  *
  * Licensed 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
@@ -19,11 +19,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.slf4j.impl.SimpleLogger;
+import org.slf4j.simple.SimpleLogger;
 
 /**
  * Sets the logging properties for the ivy engine.
- * 
+ *
  * @author Reguel Wermelinger
  * @since 6.0.0
  */
@@ -91,7 +91,7 @@ private static void setDefaultProperty(String property, String value) {
   }
 
   /**
-   * Valid levels as documented in {@link org.slf4j.impl.SimpleLogger}
+   * Valid levels as documented in {@link org.slf4j.simple.SimpleLogger}
    */
   static interface Level {
     String TRACE = "trace";

diff --git a/src/test/java/ch/ivyteam/ivy/maven/TestSlf4jWarningConfiguration.java b/src/test/java/ch/ivyteam/ivy/maven/TestSlf4jWarningConfiguration.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.Test;
-import org.slf4j.impl.SimpleLogger;
+import org.slf4j.simple.SimpleLogger;
 
 import ch.ivyteam.ivy.maven.engine.Slf4jSimpleEngineProperties;