Replace gossip-bootstrap with slf4j-api

jline · Jun 10, 2017 · 58f78be · 58f78be
1 parent a70fe35
commit 58f78be
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/style/pom.xml b/style/pom.xml
@@ -34,12 +34,6 @@
             <version>1.7.25</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.planet57.gossip</groupId>
-            <artifactId>gossip-bootstrap</artifactId>
-            <version>2.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>

diff --git a/style/src/main/java/org/jline/style/MemoryStyleSource.java b/style/src/main/java/org/jline/style/MemoryStyleSource.java
@@ -14,8 +14,8 @@
 
 import javax.annotation.Nullable;
 
-import com.planet57.gossip.Log;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
 
@@ -27,7 +27,7 @@
 public class MemoryStyleSource
   implements StyleSource
 {
-  private static final Logger log = Log.getLogger(MemoryStyleSource.class);
+  private static final Logger log = LoggerFactory.getLogger(MemoryStyleSource.class);
 
   private final Map<String,Map<String,String>> backing = new ConcurrentHashMap<>();
 

diff --git a/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java b/style/src/main/java/org/jline/style/StyleBundleInvocationHandler.java
@@ -14,13 +14,13 @@
 
 import javax.annotation.Nullable;
 
-import com.planet57.gossip.Log;
 import org.jline.style.StyleBundle.DefaultStyle;
 import org.jline.style.StyleBundle.StyleGroup;
 import org.jline.style.StyleBundle.StyleName;
 import org.jline.utils.AttributedString;
 import org.jline.utils.AttributedStyle;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
 
@@ -33,7 +33,7 @@
 class StyleBundleInvocationHandler
     implements InvocationHandler
 {
-  private static final Logger log = Log.getLogger(StyleBundleInvocationHandler.class);
+  private static final Logger log = LoggerFactory.getLogger(StyleBundleInvocationHandler.class);
 
   private final Class<? extends StyleBundle> type;
 

diff --git a/style/src/main/java/org/jline/style/StyleResolver.java b/style/src/main/java/org/jline/style/StyleResolver.java
@@ -12,9 +12,9 @@
 
 import javax.annotation.Nullable;
 
-import com.planet57.gossip.Log;
 import org.jline.utils.AttributedStyle;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
 import static org.jline.utils.AttributedStyle.*;
@@ -28,7 +28,7 @@
  */
 public class StyleResolver
 {
-  private static final Logger log = Log.getLogger(StyleResolver.class);
+  private static final Logger log = LoggerFactory.getLogger(StyleResolver.class);
 
   private final StyleSource source;
 

diff --git a/style/src/main/java/org/jline/style/Styler.java b/style/src/main/java/org/jline/style/Styler.java
@@ -8,9 +8,9 @@
  */
 package org.jline.style;
 
-import com.planet57.gossip.Log;
 import org.jline.style.StyleBundle.StyleGroup;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNull;
 
@@ -24,7 +24,7 @@
  */
 public class Styler
 {
-  private static final Logger log = Log.getLogger(Styler.class);
+  private static final Logger log = LoggerFactory.getLogger(Styler.class);
 
   private static volatile StyleSource source = new NopStyleSource();
 

diff --git a/style/src/test/java/org/jline/style/StyleTestSupport.groovy b/style/src/test/java/org/jline/style/StyleTestSupport.groovy
@@ -10,9 +10,7 @@ package org.jline.style
 
 import org.sonatype.goodies.testsupport.TestSupport
 
-import com.planet57.gossip.Log
 import org.junit.Before
-import org.slf4j.LoggerFactory
 
 /**
  * Support for style tests.
@@ -24,9 +22,6 @@ class StyleTestSupport
 
   @Before
   void setUp() {
-    // force bootstrap gossip logger to adapt to runtime logger-factory
-    Log.configure(LoggerFactory.getILoggerFactory())
-
     this.source = new MemoryStyleSource()
   }
 }