From c3ed6d953e98a449e0b8055c336f1b4a4dc60608 Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <spampot+github@posteo.eu>
Date: Fri, 29 Oct 2021 17:54:08 +0200
Subject: [PATCH] Minor fixes. Update github actions.

---
 .github/workflows/ci.yml                           |  4 +++-
 .github/workflows/release.yml                      |  3 ++-
 .github/workflows/snapshot.yml                     |  9 ++++++---
 lombok.config                                      | 14 ++++++++++++++
 pom.xml                                            |  4 ++--
 .../micronaut/logging/layout/GcpJsonLayout.java    |  2 ++
 .../resources/io/kokuwa/logback/appender-gcp.xml   |  4 ++--
 7 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4efb2e6..dec1718 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,8 +25,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: 11
+          cache: maven
       - run: mvn -B dependency:go-offline -q
       - run: mvn -B verify
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e26eba4..3f13993 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,8 +35,9 @@ jobs:
         run: |
             git config user.email "actions@github.com"
             git config user.name "GitHub Actions"
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: 11
           server-id: sonatype-nexus
           server-username: SERVER_USERNAME
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index 5f08a0a..ab9bf69 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -1,10 +1,11 @@
 name: Snapshot
 
 "on":
+  workflow_dispatch: {}
   push:
     branches:
-      - 'main'
-      - '[1-9]+.[0-9]+.x'
+      - main
+      - '*.x'
 
 jobs:
 
@@ -32,9 +33,11 @@ jobs:
       - lint-yaml
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v2
         with:
+          distribution: temurin
           java-version: 11
+          cache: maven
           server-id: sonatype-nexus
           server-username: SERVER_USERNAME
           server-password: SERVER_PASSWORD
diff --git a/lombok.config b/lombok.config
index accc767..4fc0545 100644
--- a/lombok.config
+++ b/lombok.config
@@ -1,4 +1,18 @@
 config.stopBubbling = true
 
+lombok.addNullAnnotations = CUSTOM:io.micronaut.core.annotation.NonNull:io.micronaut.core.annotation.Nullable
 lombok.addJavaxGeneratedAnnotation = true
 lombok.addLombokGeneratedAnnotation = true
+
+# adjust model
+lombok.equalsAndHashCode.callSuper = call
+lombok.toString.callSuper = call
+lombok.accessors.chain = true
+
+# use slf4j
+lombok.log.apacheCommons.flagUsage = error
+lombok.log.javaUtilLogging.flagUsage = error
+lombok.log.jbosslog.flagUsage = error
+lombok.log.log4j.flagUsage = error
+lombok.log.log4j2.flagUsage = error
+lombok.log.xslf4j.flagUsage = error
diff --git a/pom.xml b/pom.xml
index 98da885..dc1a1af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.kokuwa</groupId>
 		<artifactId>maven-parent</artifactId>
-		<version>0.5.1</version>
+		<version>0.5.3</version>
 		<relativePath />
 	</parent>
 
@@ -14,7 +14,7 @@
 	<version>0.1.3-SNAPSHOT</version>
 
 	<name>Logging support for Micronaut</name>
-	<description>Endhanced logging using MDC or request header.</description>
+	<description>Enhanced logging using MDC or request header.</description>
 	<url>https://github.com/kokuwaio/micronaut-logging</url>
 	<inceptionYear>2020</inceptionYear>
 	<licenses>
diff --git a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java
index 7b0ce16..0cd52d8 100644
--- a/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java
+++ b/src/main/java/io/kokuwa/micronaut/logging/layout/GcpJsonLayout.java
@@ -9,6 +9,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.contrib.json.classic.JsonLayout;
 import io.micronaut.core.util.StringUtils;
 import lombok.Setter;
+import lombok.experimental.Accessors;
 
 /**
  * GCP logging layout.
@@ -17,6 +18,7 @@ import lombok.Setter;
  * @see "https://cloud.google.com/logging/docs/agent/configuration#process-payload"
  * @see "https://cloud.google.com/error-reporting/reference/rest/v1beta1/ServiceContext"
  */
+@Accessors(chain = false)
 public class GcpJsonLayout extends JsonLayout {
 
 	private static final String UNDEFINED = "_IS_UNDEFINED";
diff --git a/src/main/resources/io/kokuwa/logback/appender-gcp.xml b/src/main/resources/io/kokuwa/logback/appender-gcp.xml
index 6089d9c..e847d99 100644
--- a/src/main/resources/io/kokuwa/logback/appender-gcp.xml
+++ b/src/main/resources/io/kokuwa/logback/appender-gcp.xml
@@ -4,8 +4,8 @@
 	<appender name="GCP" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
 			<layout class="io.kokuwa.micronaut.logging.layout.GcpJsonLayout">
-				<serviceName>${serviceName}</serviceName>
-				<serviceVersion>${serviceVersion}</serviceVersion>
+				<serviceName>${SERVICE_NAME}</serviceName>
+				<serviceVersion>${SERVICE_VERSION}</serviceVersion>
 				<jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter" />
 				<appendLineSeparator>true</appendLineSeparator>
 				<includeMessage>true</includeMessage>