Release 1.13.19 (#558)

.github/workflows/docker.yml

@@ -20,7 +20,7 @@ jobs:
           running-workflow-name: 'Verify'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           allowed-conclusions: success
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
       - name: Build Image
         run: docker build . -f docker/Dockerfile -t ghcr.io/rainbowdashlabs/reputation-bot:${{ github.sha }}

.github/workflows/docs.yml

@@ -8,7 +8,7 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x

.github/workflows/verify.yml

@@ -8,7 +8,7 @@ jobs:
     name: Gradle build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1
       - name: Set up JDK 19
         uses: actions/setup-java@v3
@@ -25,7 +25,7 @@ jobs:
     name: Docker build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build as Docker image
         run: docker build . -f docker/Dockerfile
 
@@ -34,7 +34,7 @@ jobs:
     name: Encoding check
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Remove allowed us-ascii files before check
         run: rm src/main/resources/locale.properties src/main/resources/locale_en_US.properties # This needs improvement
       - name: Check UTF-8 for resource bundles
@@ -47,7 +47,7 @@ jobs:
     name: Docs build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x

build.gradle.kts

@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+
 plugins {
     alias(libs.plugins.shadow)
     alias(libs.plugins.spotless)
@@ -6,7 +8,7 @@ plugins {
 }
 
 group = "de.chojo"
-version = "1.13.18"
+version = "1.13.19"
 
 repositories {
     maven("https://eldonexus.de/repository/maven-public")
@@ -81,6 +83,7 @@ tasks {
     }
 
     shadowJar {
+        transform(Log4j2PluginsCacheFileTransformer::class.java)
         mergeServiceFiles()
         manifest {
             attributes(mapOf("Main-Class" to "de.chojo.repbot.ReputationBot"))

docker/Dockerfile

@@ -3,7 +3,7 @@ FROM gradle:jdk19-alpine as build
 COPY . .
 RUN gradle clean build --no-daemon
 
-FROM eclipse-temurin:19-alpine as runtime
+FROM eclipse-temurin:21-alpine as runtime
 
 WORKDIR /app
 

docker/config/log4j2.xml

@@ -38,6 +38,12 @@
             <MarkerFilter marker="NOTIFY_ADMIN" onMatch="ACCEPT" onMismatch="DENY"/>
         </DiscordWebhook>
 
+        <Socket name="socket" host="localhost" port="8888" protocol="udp">
+            <JsonTemplateLayout eventTemplateUri="classpath:EcsLayout.json">
+                <EventTemplateAdditionalField key="index" value="repbot"/>
+            </JsonTemplateLayout>
+        </Socket>
+
     </Appenders>
     <Loggers>
         <!-- remove too verbose library logging -->
@@ -48,7 +54,7 @@
         <Root level="TRACE">
             <AppenderRef ref="ConsoleDebug"/>
             <AppenderRef ref="RollingFile"/>
-
+            <AppenderRef ref="socket"/>
             <AppenderRef ref="DiscordVerbose"/>
             <AppenderRef ref="DiscordStatus"/>
             <AppenderRef ref="DiscordError"/>

docker/docker-compose.yml

@@ -12,7 +12,7 @@ services:
   database:
     networks:
       - repbot
-    image: postgres:15.3
+    image: postgres:16.0
     expose:
       - 5432
     volumes:

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -144,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -201,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

settings.gradle.kts

@@ -1,7 +1,7 @@
 rootProject.name = "rep-bot"
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version("0.6.0")
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0")
 }
 
 dependencyResolutionManagement {
@@ -15,14 +15,15 @@ dependencyResolutionManagement {
             library("sadu-datasource", "de.chojo.sadu", "sadu-datasource").versionRef("sadu")
             bundle("sadu", listOf("sadu-queries", "sadu-updater", "sadu-postgresql", "sadu-datasource"))
 
-            version("log4j", "2.20.0")
-            library("slf4j-api", "org.slf4j:slf4j-api:2.0.7")
+            version("log4j", "2.21.1")
+            library("slf4j-api", "org.slf4j:slf4j-api:2.0.9")
             library("log4j-core", "org.apache.logging.log4j", "log4j-core").versionRef("log4j")
             library("log4j-slf4j2", "org.apache.logging.log4j", "log4j-slf4j2-impl").versionRef("log4j")
-            bundle("log4j", listOf("slf4j-api", "log4j-core", "log4j-slf4j2"))
+            library("log4j-jsontemplate","org.apache.logging.log4j", "log4j-layout-template-json").versionRef("log4j")
+            bundle("log4j", listOf("slf4j-api", "log4j-core", "log4j-slf4j2", "log4j-jsontemplate"))
 
             // plugins
-            plugin("spotless", "com.diffplug.spotless").version("6.20.0")
+            plugin("spotless", "com.diffplug.spotless").version("6.22.0")
             plugin("shadow", "com.github.johnrengelman.shadow").version("8.1.1")
 
         }