[Logging] use only log4j-2 Loggers and only depend on api (#254)

Also clean up logging dependencies.
axkr · Sep 3, 2021 · e3606eb · e3606eb
1 parent f2e152a
commit e3606eb
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 46 deletions.
diff --git a/symja_android_library/matheclipse-api/pom.xml b/symja_android_library/matheclipse-api/pom.xml
@@ -57,6 +57,20 @@
 			<artifactId>encoder</artifactId>
 		</dependency>
 
+		<!-- logging dependencies -->
+
+		<dependency> <!-- provide the logging-framework implementation -->
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency> <!-- bind slf4j to log4j-2-core -->
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 	</dependencies>
 
 	<repositories>

diff --git a/...e-beakerx/src/main/java/com/twosigma/beakerx/symjamma/evaluator/SymjaMMAWorkerThread.java b/...e-beakerx/src/main/java/com/twosigma/beakerx/symjamma/evaluator/SymjaMMAWorkerThread.java
@@ -15,17 +15,15 @@
  */
 package com.twosigma.beakerx.symjamma.evaluator;
 
+import java.util.concurrent.Callable;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import com.twosigma.beakerx.TryResult;
 import com.twosigma.beakerx.evaluator.JobDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.Callable;
 
 class SymjaMMAWorkerThread implements Callable<TryResult> {
 
-  private static final Logger logger =
-      LoggerFactory.getLogger(SymjaMMAWorkerThread.class.getName());
+  private static final Logger logger = LogManager.getLogger(SymjaMMAWorkerThread.class.getName());
   private final JobDescriptor j;
   protected SymjaMMAEvaluator symjaEvaluator;
 

diff --git a/.../matheclipse-beakerx/src/main/java/com/twosigma/beakerx/symjamma/widgets/Interactive.java b/.../matheclipse-beakerx/src/main/java/com/twosigma/beakerx/symjamma/widgets/Interactive.java
@@ -15,17 +15,17 @@
  */
 package com.twosigma.beakerx.symjamma.widgets;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import com.twosigma.beakerx.widget.InteractiveBase;
 import com.twosigma.beakerx.widget.Label;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class Interactive extends InteractiveBase {
 
   private static Label label;
 
-  private static final Logger logger = LoggerFactory.getLogger(Interactive.class);
+  private static final Logger logger = LogManager.getLogger(Interactive.class);
 
   //  @SuppressWarnings("unchecked")
   //  public static void interact(MethodClosure function, Object... parameters) {

diff --git a/symja_android_library/matheclipse-core/pom.xml b/symja_android_library/matheclipse-core/pom.xml
@@ -108,18 +108,7 @@
 
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
+			<artifactId>log4j-api</artifactId>
 		</dependency>
 
 	</dependencies>

diff --git a/...eclipse-core/src/main/java/org/matheclipse/core/numbertheory/SortedMultiset_BottomUp.java b/...eclipse-core/src/main/java/org/matheclipse/core/numbertheory/SortedMultiset_BottomUp.java
@@ -7,8 +7,9 @@
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeMap;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import org.apache.log4j.Logger;
 
 /**
  * A sorted set of elements with multiple occurrences, sorted smallest elements first. Sorting is
@@ -23,7 +24,7 @@ public class SortedMultiset_BottomUp<T extends Comparable<T>> extends TreeMap<T,
   private static final long serialVersionUID = -6604624351619809213L;
 
   @SuppressWarnings("unused")
-  private static final Logger LOG = Logger.getLogger(SortedMultiset_BottomUp.class);
+  private static final Logger LOG = LogManager.getLogger(SortedMultiset_BottomUp.class);
 
   /**
    * Constructor for an empty multiset, sorted smallest elements first. This sort order is

diff --git a/...heclipse-core/src/main/java/org/matheclipse/core/numbertheory/SortedMultiset_TopDown.java b/...heclipse-core/src/main/java/org/matheclipse/core/numbertheory/SortedMultiset_TopDown.java
@@ -1,7 +1,5 @@
 package org.matheclipse.core.numbertheory;
 
-import org.apache.log4j.Logger;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -10,6 +8,8 @@
 import java.util.Map;
 import java.util.SortedSet;
 import java.util.TreeMap;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * A sorted set of elements with multiple occurrences, sorted biggest elements first. Sorting is due
@@ -24,7 +24,7 @@ public class SortedMultiset_TopDown<T extends Comparable<T>> extends TreeMap<T,
   private static final long serialVersionUID = -6604624351619809213L;
 
   @SuppressWarnings("unused")
-  private static final Logger LOG = Logger.getLogger(SortedMultiset_TopDown.class);
+  private static final Logger LOG = LogManager.getLogger(SortedMultiset_TopDown.class);
 
   /**
    * Constructor for an empty multiset, sorted biggest elements first. This sort order is

diff --git a/...core/src/main/java/org/matheclipse/core/polynomials/longexponent/ExprTermOrderByName.java b/...core/src/main/java/org/matheclipse/core/polynomials/longexponent/ExprTermOrderByName.java
@@ -10,7 +10,7 @@
  */
 public class ExprTermOrderByName {
 
-  // private static final Logger logger = Logger.getLogger(ExprTermOrderByName.class);
+  // private static final Logger logger = LogManager.getLogger(ExprTermOrderByName.class);
 
   /** ExprTermOrder named LEX. */
   public static final ExprTermOrder LEX = new ExprTermOrder(ExprTermOrder.LEX);

diff --git a/.../main/java/org/matheclipse/core/polynomials/symbolicexponent/SymbolicTermOrderByName.java b/.../main/java/org/matheclipse/core/polynomials/symbolicexponent/SymbolicTermOrderByName.java
@@ -13,7 +13,7 @@
  */
 public class SymbolicTermOrderByName {
 
-  // private static final Logger logger = Logger.getLogger(ExprTermOrderByName.class);
+  // private static final Logger logger = LogManager.getLogger(ExprTermOrderByName.class);
 
   /** ExpVectorTermOrder named LEX. */
   public static final SymbolicTermOrder LEX = new SymbolicTermOrder(SymbolicTermOrder.LEX);

diff --git a/symja_android_library/matheclipse-external/pom.xml b/symja_android_library/matheclipse-external/pom.xml
@@ -66,18 +66,7 @@
 
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
+			<artifactId>log4j-api</artifactId>
 		</dependency>
 
 	</dependencies>

diff --git a/symja_android_library/matheclipse-gpl/pom.xml b/symja_android_library/matheclipse-gpl/pom.xml
@@ -32,6 +32,13 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<!-- logging dependencies -->
+
+		<dependency> <!-- bridge from log4j-1 to log4j-2 -->
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-1.2-api</artifactId>
+		</dependency>
+
 	</dependencies>
 
 	<build>

diff --git a/symja_android_library/matheclipse-io/pom.xml b/symja_android_library/matheclipse-io/pom.xml
@@ -83,6 +83,20 @@
 			<artifactId>poi-ooxml</artifactId>
 		</dependency>
 
+		<!-- logging dependencies -->
+
+		<dependency> <!-- provide the logging-framework implementation -->
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency> <!-- bind slf4j to log4j-2-core -->
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!-- test dependencies -->
 
 		<dependency>

diff --git a/symja_android_library/pom.xml b/symja_android_library/pom.xml
@@ -301,22 +301,28 @@
 
 			<!-- logging dependencies -->
 
+			<dependency>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-api</artifactId>
+				<version>2.13.2</version>
+			</dependency>
+
 			<dependency>
 				<groupId>org.apache.logging.log4j</groupId>
 				<artifactId>log4j-core</artifactId>
 				<version>2.13.2</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>log4j-over-slf4j</artifactId>
-				<version>1.7.32</version>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-1.2-api</artifactId>
+				<version>2.13.2</version>
 			</dependency>
 
 			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-simple</artifactId>
-				<version>1.7.32</version>
+				<groupId>org.apache.logging.log4j</groupId>
+				<artifactId>log4j-slf4j-impl</artifactId>
+				<version>2.13.2</version>
 			</dependency>
 
 		</dependencies>