Merge pull request #465 from logstash/remove_logback_1_1_support

Remove support for logback 1.1

Author: philsttr

README.md

@@ -86,16 +86,20 @@ Maven style:
 </dependency>
 ```
 
-If you get `ClassNotFoundException`/`NoClassDefFoundError`/`NoSuchMethodError` at runtime, then ensure the required dependencies (and appropriate versions) as specified in the pom file from the maven repository exist on the runtime classpath.  Specifically, the following need to be available on the runtime classpath:
+If you get `ClassNotFoundException`/`NoClassDefFoundError`/`NoSuchMethodError` at runtime,
+then ensure the required dependencies (and appropriate versions) as specified in the pom file
+from the maven repository exist on the runtime classpath.
+Specifically, the following need to be available on the runtime classpath:
 
 * jackson-databind / jackson-core / jackson-annotations
-* logback-core
-* logback-classic (required for logging _LoggingEvents_)
-* logback-access (required for logging _AccessEvents_)
+* logback-core >= 1.2.0
+* logback-classic >= 1.2.0 (required for logging _LoggingEvents_)
+* logback-access >= 1.2.0 (required for logging _AccessEvents_)
 * slf4j-api
 * java-uuid-generator (required if the `uuid` provider is used)
 
 Older versions than the ones specified in the pom file _might_ work, but the versions in the pom file are what testing has been performed against.
+Support for logback versions prior to 1.2.0 was removed in logstash-logback-encoder 7.0.
 
 If you are using logstash-logback-encoder in a project (such as spring-boot) that also declares dependencies on any of the above libraries, you might need to tell maven explicitly which versions to use to avoid conflicts.
 You can do so using maven's [dependencyManagement](https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Dependency_Management) feature.

src/main/java/net/logstash/logback/Logback11Support.java

@@ -42,7 +42,6 @@
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 
-import net.logstash.logback.Logback11Support;
 import net.logstash.logback.appender.destination.DelegateDestinationConnectionStrategy;
 import net.logstash.logback.appender.destination.DestinationConnectionStrategy;
 import net.logstash.logback.appender.destination.DestinationParser;
@@ -595,11 +594,7 @@ private void writeEvent(Socket socket, OutputStream outputStream, LogEvent<Event
                  * This is a standard (non-keepAlive) event.
                  * Therefore, we need to send the event.
                  */
-                if (getLogback11Support().isLogback11OrBefore()) {
-                    getLogback11Support().doEncode(encoder, logEvent.event);
-                } else {
-                    outputStream.write(encoder.encode(logEvent.event));
-                }
+                outputStream.write(encoder.encode(logEvent.event));
             } else if (hasKeepAliveDurationElapsed(lastSendEndNanoTime, startNanoTime)){
                 /*
                  * This is a keep alive event, and the keepAliveDuration has passed,
@@ -731,10 +726,6 @@ private synchronized void openSocket() {
                             ? new BufferedOutputStream(tempSocket.getOutputStream(), writeBufferSize)
                             : tempSocket.getOutputStream();
 
-                    if (getLogback11Support().isLogback11OrBefore()) {
-                        getLogback11Support().init(encoder, tempOutputStream);
-                    }
-                    
                     addInfo(peerId + "connection established.");
 
                     this.socket = tempSocket;
@@ -798,14 +789,6 @@ private synchronized void closeSocket() {
         }
 
         private void closeEncoder() {
-            if (getLogback11Support().isLogback11OrBefore()) {
-                try {
-                    getLogback11Support().close(encoder);
-                } catch (IOException ioe) {
-                    addError("Failed to close encoder", ioe);
-                }
-            }
-            
             encoder.stop();
         }
 
@@ -1057,13 +1040,6 @@ protected void fireConnectionFailed(InetSocketAddress address, Throwable throwab
     }
 
 
-    /*
-     * Visible for unit testing 
-     */
-    protected Logback11Support getLogback11Support() {
-        return Logback11Support.INSTANCE;
-    }
-    
     public Encoder<Event> getEncoder() {
         return encoder;
     }