From c20137db35118ae5e29d24a34994779b27209e39 Mon Sep 17 00:00:00 2001
From: Mark Nellemann <mark.nellemann@gmail.com>
Date: Tue, 5 Jan 2021 15:07:26 +0100
Subject: [PATCH] Replace logback w. slf4j-simple to reduce size.

---
 build.gradle                                       | 11 +++++++----
 gradle.properties                                  |  2 +-
 src/main/java/biz/nellemann/syslogd/TcpServer.java |  1 -
 src/main/resources/simplelogger.properties         |  4 ++++
 .../biz/nellemann/syslogd/SyslogParserTest.groovy  | 14 ++++++++++++++
 5 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/simplelogger.properties

diff --git a/build.gradle b/build.gradle
index 0e3aa21..82fedbd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,10 +12,10 @@ repositories {
 }
 
 dependencies {
-    annotationProcessor 'info.picocli:picocli-codegen:4.5.2'
-    implementation 'info.picocli:picocli:4.5.2'
-    implementation 'org.slf4j:slf4j-api:1.7.+'
-    runtimeOnly 'ch.qos.logback:logback-classic:1.+'
+    annotationProcessor 'info.picocli:picocli-codegen:4.6.0'
+    implementation 'info.picocli:picocli:4.6.0'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    runtimeOnly 'org.slf4j:slf4j-simple:1.7.30'
 
     testImplementation('org.spockframework:spock-core:2.0-M4-groovy-3.0')
     testImplementation("org.slf4j:slf4j-simple:1.7.+")
@@ -74,3 +74,6 @@ jar {
         )
     }
 }
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
diff --git a/gradle.properties b/gradle.properties
index ba840a7..1df34fd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 id            = syslogd
 group         = biz.nellemann.syslogd
-version       = 1.0.6
+version       = 1.0.7
diff --git a/src/main/java/biz/nellemann/syslogd/TcpServer.java b/src/main/java/biz/nellemann/syslogd/TcpServer.java
index bf60454..65f5cf0 100644
--- a/src/main/java/biz/nellemann/syslogd/TcpServer.java
+++ b/src/main/java/biz/nellemann/syslogd/TcpServer.java
@@ -21,7 +21,6 @@ import java.io.InputStreamReader;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 public class TcpServer {
diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties
new file mode 100644
index 0000000..bd2eeaa
--- /dev/null
+++ b/src/main/resources/simplelogger.properties
@@ -0,0 +1,4 @@
+org.slf4j.simpleLogger.showDateTime=true
+org.slf4j.simpleLogger.showShortLogName=true
+org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss.SSS
+org.slf4j.simpleLogger.levelInBrackets=true
diff --git a/src/test/groovy/biz/nellemann/syslogd/SyslogParserTest.groovy b/src/test/groovy/biz/nellemann/syslogd/SyslogParserTest.groovy
index d738076..d1d2a0c 100644
--- a/src/test/groovy/biz/nellemann/syslogd/SyslogParserTest.groovy
+++ b/src/test/groovy/biz/nellemann/syslogd/SyslogParserTest.groovy
@@ -32,6 +32,20 @@ class SyslogParserTest extends Specification {
         msg.application == "padmin"
     }
 
+    void "test another rfc3164 aix/vios message"() {
+
+        setup:
+        def input = "<13>Dec 18 10:09:22 Message forwarded from p924vio1: root: [errnotify] seq: 24266 - AA8AB241 1218100920 T O OPERATOR OPERATOR NOTIFICATION"
+
+        when:
+        SyslogMessage msg = SyslogParser.parseRfc3164(input)
+
+        then:
+        msg.message == "[errnotify] seq: 24266 - AA8AB241 1218100920 T O OPERATOR OPERATOR NOTIFICATION"
+        msg.hostname == "p924vio1"
+        msg.application == "root"
+    }
+
     void "test rfc3164 normal message"() {
 
         setup: