Remove logback!

neo4j · Mar 23, 2016 · 5cacce7 · 5cacce7
1 parent 079d510
commit 5cacce7
Show file tree

Hide file tree

Showing 21 changed files with 2 additions and 2,532 deletions.
diff --git a/community/bolt/src/main/java/org/neo4j/bolt/transport/Netty4LogBridge.java b/community/bolt/src/main/java/org/neo4j/bolt/transport/Netty4LogBridge.java
@@ -37,10 +37,7 @@ public class Netty4LogBridge
     public static void setLogProvider( LogProvider logProvider )
     {
         // TODO: Undo below hack in next minor/major release
-        // Netty 4 will look for and use Slf4j if it's on the classpath. In this release (2.3.x),
-        // it is on the classpath, via `logback-classic`. However, we do not configure logback,
-        // meaning some debug output leaks to stdout before we replace the logging below.
-        // This should be fixed properly in the next release that is not a patch release.
+        // Netty 4 will look for and use Slf4j if it's on the classpath.
         PrintStream originalStdOut = System.out;
         try
         {

diff --git a/community/neo4j-harness/LICENSES.txt b/community/neo4j-harness/LICENSES.txt
diff --git a/community/neo4j-harness/NOTICE.txt b/community/neo4j-harness/NOTICE.txt
@@ -86,9 +86,6 @@ Eclipse Public License, Version 1.0
   Jetty :: Utilities
   Jetty :: Webapp Application Support
   Jetty :: XML utilities
-  Logback Access Module
-  Logback Classic Module
-  Logback Core Module
 
 GNU General Public License, version 2 with the Classpath Exception
   Java Servlet API
@@ -100,14 +97,6 @@ GNU General Public License, version 2 with the Classpath Exception
   jsr311-api
   MIME streaming extension
 
-GNU Lesser General Public License, Version 2.1
-  Logback Access Module
-  Logback Classic Module
-  Logback Core Module
-
-MIT License
-  SLF4J API Module
-
 Mozilla Public License, Version 2.0
   Mozilla Rhino
 
@@ -150,18 +139,6 @@ Jetty :: XML utilities
   Apache Software License, Version 2.0
   Eclipse Public License, Version 1.0
 
-Logback Access Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
-Logback Classic Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
-Logback Core Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
 MIME streaming extension
   Common Development and Distribution License Version 1.1
   GNU General Public License, version 2 with the Classpath Exception

diff --git a/community/server/LICENSES.txt b/community/server/LICENSES.txt
diff --git a/community/server/NOTICE.txt b/community/server/NOTICE.txt
@@ -85,9 +85,6 @@ Eclipse Public License, Version 1.0
   Jetty :: Utilities
   Jetty :: Webapp Application Support
   Jetty :: XML utilities
-  Logback Access Module
-  Logback Classic Module
-  Logback Core Module
 
 GNU General Public License, version 2 with the Classpath Exception
   Java Servlet API
@@ -98,14 +95,6 @@ GNU General Public License, version 2 with the Classpath Exception
   jsr311-api
   MIME streaming extension
 
-GNU Lesser General Public License, Version 2.1
-  Logback Access Module
-  Logback Classic Module
-  Logback Core Module
-
-MIT License
-  SLF4J API Module
-
 Mozilla Public License, Version 2.0
   Mozilla Rhino
 
@@ -148,18 +137,6 @@ Jetty :: XML utilities
   Apache Software License, Version 2.0
   Eclipse Public License, Version 1.0
 
-Logback Access Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
-Logback Classic Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
-Logback Core Module
-  Eclipse Public License, Version 1.0
-  GNU Lesser General Public License, Version 2.1
-
 MIME streaming extension
   Common Development and Distribution License Version 1.1
   GNU General Public License, version 2 with the Classpath Exception

diff --git a/community/server/pom.xml b/community/server/pom.xml
@@ -169,16 +169,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-access</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>

diff --git a/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java b/community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
@@ -329,9 +329,6 @@ private void setUpHttpLogging()
             return;
         }
 
-        System.out.println("HELLO THERE");
-        System.out.println(config.get( GraphDatabaseSettings.logs_directory ).toString() );
-
         webServer.setHttpLoggingConfiguration(config.get( GraphDatabaseSettings.logs_directory ),
                 config.get( http_logging_enabled ) );
     }

diff --git a/community/server/src/main/java/org/neo4j/server/configuration/HttpLogSetting.java b/community/server/src/main/java/org/neo4j/server/configuration/HttpLogSetting.java
diff --git a/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java b/community/server/src/main/java/org/neo4j/server/web/Jetty9WebServer.java
@@ -34,7 +34,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import ch.qos.logback.access.servlet.TeeFilter;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.RequestLog;
 import org.eclipse.jetty.server.Server;

diff --git a/community/server/src/main/java/org/neo4j/server/web/WebServer.java b/community/server/src/main/java/org/neo4j/server/web/WebServer.java
@@ -45,7 +45,7 @@ public interface WebServer
 
     void setHttpsCertificateInformation( KeyStoreInformation config );
 
-    void setHttpLoggingConfiguration( File logbackConfig, boolean enableLogging );
+    void setHttpLoggingConfiguration( File logsDirectory, boolean enableLogging );
 
     void setMaxThreads( int maxThreads );
 

diff --git a/community/server/src/test/resources/neo4j-server-test-logback.xml b/community/server/src/test/resources/neo4j-server-test-logback.xml
diff --git a/enterprise/ha/pom.xml b/enterprise/ha/pom.xml
@@ -152,13 +152,6 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-backup</artifactId>

diff --git a/enterprise/neo4j-enterprise/pom.xml b/enterprise/neo4j-enterprise/pom.xml
@@ -293,18 +293,6 @@
                   <packages>org.neo4j.helpers:org.neo4j.helpers.*</packages>
                 </group>
               </groups>
-              <additionalDependencies>
-                <additionalDependency>
-                  <groupId>ch.qos.logback</groupId>
-                  <artifactId>logback-classic</artifactId>
-                  <version>${logback-classic.version}</version>
-                </additionalDependency>
-                <additionalDependency>
-                  <groupId>ch.qos.logback</groupId>
-                  <artifactId>logback-core</artifactId>
-                  <version>${logback-classic.version}</version>
-                </additionalDependency>
-              </additionalDependencies>
             </configuration>
           </execution>
         </executions>