diff --git a/.drone.yml b/.drone.yml index 50f5b59..c80e25c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,8 +11,8 @@ steps: - name: publish image: eclipse-temurin:8-jdk environment: - AUTH_TOKEN: - from_secret: auth # gitea_username:gitea_token + AUTH_TOKEN: # Gitea authentication: username:token + from_secret: auth # Name of DroneCI secret exposing above commands: - ./gradlew packages - for file in build/libs/*-all.jar ; do curl --user "$${AUTH_TOKEN}" --upload-file "$${file}" "https://git.data.coop/api/packages/${DRONE_REPO_OWNER}/generic/${DRONE_REPO_NAME}/${DRONE_TAG}/$(basename $file)" ; done diff --git a/build.gradle b/build.gradle index bfe2adf..931a7b6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,9 @@ plugins { id 'groovy' id 'application' id 'jacoco' - id "com.github.johnrengelman.shadow" version "7.1.2" id "net.nemerosa.versioning" version "2.15.1" - id "nebula.ospackage" version "9.1.1" + id "com.netflix.nebula.ospackage" version "10.0.0" + id "com.github.johnrengelman.shadow" version "7.1.2" } repositories { @@ -71,8 +71,6 @@ jacocoTestCoverageVerification { } check.dependsOn jacocoTestCoverageVerification - -apply plugin: 'nebula.ospackage' ospackage { packageName = 'syslogd' release = '1' diff --git a/doc/aix-errlogger.md b/doc/aix-errlogger.md index bdb83fb..6f59d7e 100644 --- a/doc/aix-errlogger.md +++ b/doc/aix-errlogger.md @@ -8,7 +8,7 @@ More information about the AIX errlogger is available on the IBM [knowledge cent ### Prepare the local syslog service -Configure the local syslog service to forward messages to our remote [syslogd](https://bitbucket.org/mnellemann/syslogd/) service. +Configure the local syslog service to forward messages to our remote [syslogd](https://git.data.coop/nellemann/syslogd/) service. Create an empty local log file: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..070cb70 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/biz/nellemann/syslogd/net/UdpServer.java b/src/main/java/biz/nellemann/syslogd/net/UdpServer.java index ff6307f..131fd7a 100644 --- a/src/main/java/biz/nellemann/syslogd/net/UdpServer.java +++ b/src/main/java/biz/nellemann/syslogd/net/UdpServer.java @@ -21,7 +21,6 @@ import biz.nellemann.syslogd.LogReceiveListener; import java.io.IOException; import java.net.DatagramPacket; import java.net.DatagramSocket; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java b/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java index 0c029b8..432a9f1 100644 --- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java +++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParser.java @@ -19,7 +19,6 @@ import biz.nellemann.syslogd.msg.SyslogMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.time.Instant; import java.util.zip.DataFormatException; diff --git a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java index 3f20948..a42394b 100644 --- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java +++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc3164.java @@ -15,7 +15,6 @@ */ package biz.nellemann.syslogd.parser; -import biz.nellemann.syslogd.LogReceiveEvent; import biz.nellemann.syslogd.msg.Facility; import biz.nellemann.syslogd.msg.Severity; import biz.nellemann.syslogd.msg.SyslogMessage; diff --git a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java index 239d262..f67a5ad 100644 --- a/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java +++ b/src/main/java/biz/nellemann/syslogd/parser/SyslogParserRfc5424.java @@ -15,7 +15,6 @@ */ package biz.nellemann.syslogd.parser; -import biz.nellemann.syslogd.LogReceiveEvent; import biz.nellemann.syslogd.msg.Severity; import biz.nellemann.syslogd.msg.Facility; import biz.nellemann.syslogd.msg.SyslogMessage;