Replaced slf4j/logback with FreeLogJ

AdoptOpenJDK · Dec 18, 2021 · 9259b07 · 9259b07
1 parent 173d418
commit 9259b07
Show file tree

Hide file tree

Showing 70 changed files with 537 additions and 725 deletions.
diff --git a/build.properties b/build.properties
@@ -1 +1 @@
-version=1.4.3
+version=1.4.4
diff --git a/core/build.gradle b/core/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.30', 'ch.qos.logback:logback-classic:1.2.3', 'ch.qos.logback:logback-core:1.2.3'
+    compile 'com.chrisnewland.freelogj:freelogj:0.0.1'
     testCompile 'junit:junit:4.13.1'
 }
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -1,68 +1,30 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>com.chrisnewland</groupId>
-		<artifactId>jitwatch-parent</artifactId>
-		<version>1.4.3</version>
-	</parent>
-
-	<artifactId>jitwatch-core</artifactId>
-
-	<name>JITWatch Core</name>
-
-	<!-- ======== Dependencies ======== -->
-	<dependencyManagement>
-		<dependencies>
-
-			<!-- ======== SLF4J Logging Framework ======== -->
-			<dependency>
-				<groupId>org.slf4j</groupId>
-				<artifactId>slf4j-api</artifactId>
-				<version>${slf4j.version}</version>
-			</dependency>
-
-			<!-- ======== Logback bindings for SLF4J ======== -->
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-classic</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-			<dependency>
-				<groupId>ch.qos.logback</groupId>
-				<artifactId>logback-core</artifactId>
-				<version>${logback.version}</version>
-			</dependency>
-
-			<!-- ======== JUnit 4 ======== -->
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-classic</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>ch.qos.logback</groupId>
-			<artifactId>logback-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-	</dependencies>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.chrisnewland</groupId>
+        <artifactId>jitwatch-parent</artifactId>
+        <version>1.4.4</version>
+    </parent>
+
+    <artifactId>jitwatch-core</artifactId>
+
+    <name>JITWatch Core</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.chrisnewland</groupId>
+            <artifactId>FreeLogJ</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/chain/CompileChainWalker.java b/core/src/main/java/org/adoptopenjdk/jitwatch/chain/CompileChainWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -43,8 +43,8 @@
 import org.adoptopenjdk.jitwatch.model.LogParseException;
 import org.adoptopenjdk.jitwatch.model.Tag;
 import org.adoptopenjdk.jitwatch.util.TooltipUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class CompileChainWalker extends AbstractCompilationVisitable
 {

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/compilation/CompilationUtil.java b/core/src/main/java/org/adoptopenjdk/jitwatch/compilation/CompilationUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2018 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -38,8 +38,8 @@
 import org.adoptopenjdk.jitwatch.model.Task;
 import org.adoptopenjdk.jitwatch.util.ParseUtil;
 import org.adoptopenjdk.jitwatch.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public final class CompilationUtil
 {

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/compilation/codecache/CodeCacheEventWalker.java b/core/src/main/java/org/adoptopenjdk/jitwatch/compilation/codecache/CodeCacheEventWalker.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Chris Newland.
+ * Copyright (c) 2017-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -11,8 +11,8 @@
 import org.adoptopenjdk.jitwatch.model.Compilation;
 import org.adoptopenjdk.jitwatch.model.IMetaMember;
 import org.adoptopenjdk.jitwatch.model.IReadOnlyJITDataModel;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class CodeCacheEventWalker extends AbstractCompilationWalker
 {
@@ -33,7 +33,7 @@ public void reset()
 
 	@Override
 	public void visit(IMetaMember metaMember)
-	{			
+	{
 		if (metaMember != null && metaMember.isCompiled())
 		{
 			for (Compilation compilation : metaMember.getCompilations())
@@ -86,4 +86,4 @@ public CodeCacheWalkerResult getResult()
 	{
 		return result;
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConfig.java b/core/src/main/java/org/adoptopenjdk/jitwatch/core/JITWatchConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -27,8 +27,8 @@
 
 import org.adoptopenjdk.jitwatch.model.ParsedClasspath;
 import org.adoptopenjdk.jitwatch.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class JITWatchConfig
 {
@@ -919,4 +919,4 @@ public void setLocalAsmLabels(boolean localAsmLabels)
 	{
 		this.localAsmLabels = localAsmLabels;
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/core/TagProcessor.java b/core/src/main/java/org/adoptopenjdk/jitwatch/core/TagProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -21,8 +21,8 @@
 import org.adoptopenjdk.jitwatch.model.Task;
 import org.adoptopenjdk.jitwatch.model.bytecode.Opcode;
 import org.adoptopenjdk.jitwatch.util.StringUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class TagProcessor
 {

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/demo/MakeHotSpotLog.java b/core/src/main/java/org/adoptopenjdk/jitwatch/demo/MakeHotSpotLog.java
@@ -5,8 +5,8 @@
  */
 package org.adoptopenjdk.jitwatch.demo;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/histo/InlineSizeHistoVisitable.java b/core/src/main/java/org/adoptopenjdk/jitwatch/histo/InlineSizeHistoVisitable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -45,8 +45,8 @@
 import org.adoptopenjdk.jitwatch.model.IReadOnlyJITDataModel;
 import org.adoptopenjdk.jitwatch.model.LogParseException;
 import org.adoptopenjdk.jitwatch.model.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class InlineSizeHistoVisitable extends AbstractHistoVisitable
 {
@@ -190,4 +190,4 @@ public void visitTag(Tag parseTag, IParseDictionary parseDictionary) throws LogP
 	{
 		processParseTag(parseTag, parseDictionary);
 	}
-}
+}
diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/hotthrow/HotThrowFinder.java b/core/src/main/java/org/adoptopenjdk/jitwatch/hotthrow/HotThrowFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 Chris Newland.
+ * Copyright (c) 2016-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -50,8 +50,8 @@
 import org.adoptopenjdk.jitwatch.model.bytecode.ExceptionTableEntry;
 import org.adoptopenjdk.jitwatch.model.bytecode.MemberBytecode;
 import org.adoptopenjdk.jitwatch.util.ParseUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public final class HotThrowFinder extends AbstractCompilationVisitable
 {

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/inline/HeadlessInlineVisitor.java b/core/src/main/java/org/adoptopenjdk/jitwatch/inline/HeadlessInlineVisitor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2016 Jean Phillipe BEMPEL
+ * Copyright (c) 2015-2021 Jean Phillipe BEMPEL
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -35,8 +35,8 @@
 import org.adoptopenjdk.jitwatch.model.Tag;
 import org.adoptopenjdk.jitwatch.treevisitor.ITreeVisitable;
 import org.adoptopenjdk.jitwatch.util.ParseUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public class HeadlessInlineVisitor implements ITreeVisitable
 {

diff --git a/core/src/main/java/org/adoptopenjdk/jitwatch/intrinsic/IntrinsicFinder.java b/core/src/main/java/org/adoptopenjdk/jitwatch/intrinsic/IntrinsicFinder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2016 Chris Newland.
+ * Copyright (c) 2013-2021 Chris Newland.
  * Licensed under https://github.com/AdoptOpenJDK/jitwatch/blob/master/LICENSE-BSD
  * Instructions: https://github.com/AdoptOpenJDK/jitwatch/wiki
  */
@@ -45,8 +45,8 @@
 import org.adoptopenjdk.jitwatch.model.IParseDictionary;
 import org.adoptopenjdk.jitwatch.model.LogParseException;
 import org.adoptopenjdk.jitwatch.model.Tag;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.chrisnewland.freelogj.Logger;
+import com.chrisnewland.freelogj.LoggerFactory;
 
 public final class IntrinsicFinder extends AbstractCompilationVisitable
 {