From a19a92380e0452cde97e4d3f4a0854b7caa38094 Mon Sep 17 00:00:00 2001 From: StrongestNumber9 <16169054+StrongestNumber9@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:06:02 +0300 Subject: [PATCH 1/2] Updates rlp_01, uses rlo_14 --- pom.xml | 12 ++++++------ .../com/teragrep/jla_01/LoggingEventConverter.java | 8 ++++---- .../java/com/teragrep/jla_01/RlpLogbackAppender.java | 5 ++--- .../teragrep/jla_01/LoggingEventConverterTest.java | 12 +----------- 4 files changed, 13 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 0855ce4..bba8eae 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.teragrep rlp_01 - 3.3.1 + 4.0.1 ch.qos.logback @@ -65,11 +65,11 @@ 3.11 test - - com.cloudbees - syslog-java-client - 1.1.7 - + + com.teragrep + rlo_14 + 1.0.1 + org.mockito diff --git a/src/main/java/com/teragrep/jla_01/LoggingEventConverter.java b/src/main/java/com/teragrep/jla_01/LoggingEventConverter.java index 22e82f6..aae0aa0 100644 --- a/src/main/java/com/teragrep/jla_01/LoggingEventConverter.java +++ b/src/main/java/com/teragrep/jla_01/LoggingEventConverter.java @@ -20,10 +20,10 @@ Reliable Event Logging Protocol (RELP) Logback plugin import java.util.Date; import java.util.Map; -import com.cloudbees.syslog.Facility; -import com.cloudbees.syslog.SDElement; -import com.cloudbees.syslog.Severity; -import com.cloudbees.syslog.SyslogMessage; +import com.teragrep.rlo_14.Facility; +import com.teragrep.rlo_14.SyslogMessage; +import com.teragrep.rlo_14.SDElement; +import com.teragrep.rlo_14.Severity; public class LoggingEventConverter { diff --git a/src/main/java/com/teragrep/jla_01/RlpLogbackAppender.java b/src/main/java/com/teragrep/jla_01/RlpLogbackAppender.java index e542991..1e1aed5 100644 --- a/src/main/java/com/teragrep/jla_01/RlpLogbackAppender.java +++ b/src/main/java/com/teragrep/jla_01/RlpLogbackAppender.java @@ -24,10 +24,9 @@ Reliable Event Logging Protocol (RELP) Logback plugin import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.encoder.LayoutWrappingEncoder; -import com.cloudbees.syslog.SDElement; -import com.cloudbees.syslog.SyslogMessage; +import com.teragrep.rlo_14.SDElement; +import com.teragrep.rlo_14.SyslogMessage; import com.teragrep.rlp_01.RelpBatch; import ch.qos.logback.core.AppenderBase; diff --git a/src/test/java/com/teragrep/jla_01/LoggingEventConverterTest.java b/src/test/java/com/teragrep/jla_01/LoggingEventConverterTest.java index e33b9ff..9bcdc5f 100644 --- a/src/test/java/com/teragrep/jla_01/LoggingEventConverterTest.java +++ b/src/test/java/com/teragrep/jla_01/LoggingEventConverterTest.java @@ -20,25 +20,15 @@ Reliable Event Logging Protocol (RELP) Logback plugin import static org.junit.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertEquals; -import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; - -import org.apache.commons.lang3.StringUtils; import org.junit.jupiter.api.Test; -import org.slf4j.Marker; - -import com.cloudbees.syslog.SyslogMessage; -import com.teragrep.jla_01.LoggingEventConverter; - -import ch.qos.logback.classic.Level; +import com.teragrep.rlo_14.SyslogMessage; import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.classic.spi.IThrowableProxy; -import ch.qos.logback.classic.spi.LoggerContextVO; public class LoggingEventConverterTest { From 9c8651fafcc005e39121b7a471f92014c6da1fac Mon Sep 17 00:00:00 2001 From: StrongestNumber9 <16169054+StrongestNumber9@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:07:50 +0300 Subject: [PATCH 2/2] Cosmetic change only, reindents pom.xml --- pom.xml | 440 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 217 insertions(+), 223 deletions(-) diff --git a/pom.xml b/pom.xml index bba8eae..c9d64ac 100644 --- a/pom.xml +++ b/pom.xml @@ -1,229 +1,223 @@ - jar - 4.0.0 - com.teragrep - jla_01 - ${revision}${sha1}${changelist} - jla_01 - Reliable Event Logging Protocol (RELP) Logback plugin - https://teragrep.com - - UTF-8 - UTF-8 - 1.8 - 0.0.1 - -SNAPSHOT - - - - - - Apache License 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - - - - - - Mikko Kortelainen - 1@teragrep.com - Teragrep - https://teragrep.com - - - - - scm:git:https://github.com/teragrep/jla_01.git - scm:git:git@github.com:teragrep/jla_01.git - https://github.com/teragrep/jla_01/tree/master - + 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"> + jar + 4.0.0 + com.teragrep + jla_01 + ${revision}${sha1}${changelist} + jla_01 + Reliable Event Logging Protocol (RELP) Logback plugin + https://teragrep.com + + UTF-8 + UTF-8 + 1.8 + 0.0.1 + -SNAPSHOT + + - - - com.teragrep - rlp_01 + + + Apache License 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + Mikko Kortelainen + 1@teragrep.com + Teragrep + https://teragrep.com + + + + + scm:git:https://github.com/teragrep/jla_01.git + scm:git:git@github.com:teragrep/jla_01.git + https://github.com/teragrep/jla_01/tree/master + + + + com.teragrep + rlp_01 4.0.1 - - - ch.qos.logback - logback-classic - 1.2.9 - provided - - - ch.qos.logback - logback-core - 1.2.9 - provided - - - org.apache.commons - commons-lang3 - 3.11 - test - + + + ch.qos.logback + logback-classic + 1.2.9 + provided + + + ch.qos.logback + logback-core + 1.2.9 + provided + + + org.apache.commons + commons-lang3 + 3.11 + test + com.teragrep rlo_14 1.0.1 - - - org.mockito - mockito-core - 3.6.0 - test - - - org.mockito - mockito-inline - 3.6.0 - test - - - org.junit.jupiter - junit-jupiter-engine - 5.4.0-RC1 - test - - - org.junit.platform - junit-platform-launcher - 1.4.0-RC1 - test - - - junit - junit - 4.13.1 - test - - - - org.junit.jupiter - junit-jupiter-api - 5.4.0-RC1 - test - - - - - - - ${project.basedir}/target - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.9.1 - - - attach-javadocs - - jar - - - 8 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 8 - 8 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.22.2 - - all - true - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - false - - - - de.smartics.maven.plugin - smartics-jboss-modules-maven-plugin - 2.1.5 - - - create-modules-archive - - create-modules-archive - - package - - - - main - main - true - - - ch.qos.logback - - - com.github.spotbugs - - - - - - org.codehaus.mojo - flatten-maven-plugin - 1.1.0 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - + + org.mockito + mockito-core + 3.6.0 + test + + + org.mockito + mockito-inline + 3.6.0 + test + + + org.junit.jupiter + junit-jupiter-engine + 5.4.0-RC1 + test + + + org.junit.platform + junit-platform-launcher + 1.4.0-RC1 + test + + + junit + junit + 4.13.1 + test + + + org.junit.jupiter + junit-jupiter-api + 5.4.0-RC1 + test + + + + ${project.basedir}/target + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + 8 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 8 + 8 + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + all + true + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.8.2 + + false + + + + de.smartics.maven.plugin + smartics-jboss-modules-maven-plugin + 2.1.5 + + + create-modules-archive + + create-modules-archive + + package + + + + main + main + true + + + ch.qos.logback + + + com.github.spotbugs + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.1.0 + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + publish-maven-central @@ -257,9 +251,9 @@ https://oss.sonatype.org/content/repositories/snapshots - ossrh - Central Repository OSSRH - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + ossrh + Central Repository OSSRH + https://oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -291,9 +285,9 @@ - github - GitHub Packages - https://maven.pkg.github.com/teragrep/jla_01 + github + GitHub Packages + https://maven.pkg.github.com/teragrep/jla_01