From e2c6a7daa162f7c409b4e4c8b00ccbe784dc7fcb Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <stephan.schnabel@posteo.de>
Date: Sat, 18 Feb 2023 14:51:46 +0100
Subject: [PATCH] Update versions and build stuff

---
 .github/CODEOWNERS        |  4 +++-
 .github/dependabot.yml    | 13 ++++++++++++-
 .github/workflows/ci.yaml | 32 +++++++++++++++++++++-----------
 README.md                 |  2 +-
 pom.xml                   | 38 +++++++++++++++++++-------------------
 5 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 04a08ef..6e53241 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,4 @@
 # https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
-* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel
+* @sschnabe @rpahli @fabian-schlegel @wistefan
+.github/workflows/* @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan
+pom.xml @kokuwaio-bot @sschnabe @rpahli @fabian-schlegel @wistefan
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ce15cea..e754c9d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,11 +3,22 @@ updates:
   - package-ecosystem: maven
     directory: /
     schedule:
-      interval: daily
+      interval: monthly
+      day: monday
+      # github parses time without quotes to int
+      # yamllint disable-line rule:quoted-strings
+      time: "09:00"
+      timezone: Europe/Berlin
     ignore:
+      # logback 1.3 and 1.4 are compatible with slf4j 2.x only
       - dependency-name: ch.qos.logback:logback-classic
         update-types: [version-update:semver-major, version-update:semver-minor]
   - package-ecosystem: github-actions
     directory: /
     schedule:
       interval: monthly
+      day: monday
+      # github parses time without quotes to int
+      # yamllint disable-line rule:quoted-strings
+      time: "09:00"
+      timezone: Europe/Berlin
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b40100f..8383223 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,19 +25,29 @@ jobs:
         with:
           args: /github/workspace
 
-  codeql:
+  javadoc:
     runs-on: ubuntu-latest
-    permissions:
-      security-events: write
-      actions: read
-      contents: read
     steps:
       - uses: actions/checkout@v3
-      - uses: github/codeql-action/init@v2
+      - uses: actions/setup-java@v3
         with:
-          languages: java
-      - uses: github/codeql-action/autobuild@v2
-      - uses: github/codeql-action/analyze@v2
+          distribution: temurin
+          java-version: 11
+          cache: maven
+      - run: mvn -B -ntp dependency:go-offline
+      - run: mvn -B -ntp javadoc:javadoc-no-fork -Dmaven.javadoc.failOnWarnings=true -Ddoclint=all
+
+  checkstyle:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+          cache: maven
+      - run: mvn -B -ntp dependency:go-offline
+      - run: mvn -B -ntp checkstyle:check
 
   build:
     runs-on: ubuntu-latest
@@ -52,9 +62,9 @@ jobs:
           server-username: SERVER_USERNAME
           server-password: SERVER_PASSWORD
       - run: mvn -B -ntp dependency:go-offline
-      - run: mvn -B -ntp verify
+      - run: mvn -B -ntp verify -Dcheckstyle.skip
         if: ${{ github.ref != 'refs/heads/main' }}
-      - run: mvn -B -ntp deploy
+      - run: mvn -B -ntp deploy -Dcheckstyle.skip
         if: ${{ github.ref == 'refs/heads/main' }}
         env:
           SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
diff --git a/README.md b/README.md
index e9dbb68..9260ec1 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Include in your `pom.xml`:
 ## Features
 
 * Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 1.7 & Logback 1.2
-* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4
+* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/4.x) is based on SLF4J 2.0 & Logback 1.4 (WIP)
 * [set log level based on MDC values](docs/features/logback_mdc_level.md)
 * [add default xml](docs/features/logback_default.md)
 * [preconfigured appender for different environments](docs/features/logback_appender.md)
diff --git a/pom.xml b/pom.xml
index fef007e..2cf0b76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>io.kokuwa.micronaut</groupId>
@@ -65,49 +65,44 @@
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.propertiesEncoding>ISO-8859-1</project.build.propertiesEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<maven.compiler.source>11</maven.compiler.source>
 		<maven.compiler.target>11</maven.compiler.target>
 		<maven.compiler.parameters>true</maven.compiler.parameters>
 		<maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
 		<maven.compiler.showWarnings>true</maven.compiler.showWarnings>
-
+		<maven.compiler.failOnWarning>true</maven.compiler.failOnWarning>
 		<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
 
-		<checkstyle.config.location>checkstyle.xml</checkstyle.config.location>
-		<checkstyle.suppressions.location>checkstyle-suppression.xml</checkstyle.suppressions.location>
-		<checkstyle.includeTestSourceDirectory>true</checkstyle.includeTestSourceDirectory>
-
 		<!-- ===================================================================== -->
 		<!-- ============================= Versions ============================== -->
 		<!-- ===================================================================== -->
 
 		<!-- plugins -->
 
-		<version.org.apache.maven.plugins.checkstyle>3.2.0</version.org.apache.maven.plugins.checkstyle>
+		<version.org.apache.maven.plugins.checkstyle>3.2.1</version.org.apache.maven.plugins.checkstyle>
 		<version.org.apache.maven.plugins.clean>3.2.0</version.org.apache.maven.plugins.clean>
 		<version.org.apache.maven.plugins.compiler>3.10.1</version.org.apache.maven.plugins.compiler>
-		<version.org.apache.maven.plugins.dependency_>3.3.0</version.org.apache.maven.plugins.dependency_>
-		<version.org.apache.maven.plugins.deploy>3.0.0</version.org.apache.maven.plugins.deploy>
+		<version.org.apache.maven.plugins.dependency>3.5.0</version.org.apache.maven.plugins.dependency>
+		<version.org.apache.maven.plugins.deploy>3.1.0</version.org.apache.maven.plugins.deploy>
 		<version.org.apache.maven.plugins.gpg>3.0.1</version.org.apache.maven.plugins.gpg>
-		<version.org.apache.maven.plugins.install>3.0.1</version.org.apache.maven.plugins.install>
-		<version.org.apache.maven.plugins.javadoc>3.4.1</version.org.apache.maven.plugins.javadoc>
-		<version.org.apache.maven.plugins.jar>3.2.2</version.org.apache.maven.plugins.jar>
-		<version.org.apache.maven.plugins.release>3.0.0-M6</version.org.apache.maven.plugins.release>
+		<version.org.apache.maven.plugins.install>3.1.0</version.org.apache.maven.plugins.install>
+		<version.org.apache.maven.plugins.javadoc>3.5.0</version.org.apache.maven.plugins.javadoc>
+		<version.org.apache.maven.plugins.jar>3.3.0</version.org.apache.maven.plugins.jar>
+		<version.org.apache.maven.plugins.release>3.0.0-M7</version.org.apache.maven.plugins.release>
 		<version.org.apache.maven.plugins.resources>3.3.0</version.org.apache.maven.plugins.resources>
 		<version.org.apache.maven.plugins.source>3.2.1</version.org.apache.maven.plugins.source>
-		<version.org.apache.maven.plugins.surefire>3.0.0-M7</version.org.apache.maven.plugins.surefire>
-		<version.org.codehaus.mojo.tidy>1.1.0</version.org.codehaus.mojo.tidy>
+		<version.org.apache.maven.plugins.surefire>3.0.0-M9</version.org.apache.maven.plugins.surefire>
+		<version.org.codehaus.mojo.tidy>1.2.0</version.org.codehaus.mojo.tidy>
 		<version.org.sonatype.plugins.nexus-staging>1.6.13</version.org.sonatype.plugins.nexus-staging>
-		<version.com.puppycrawl.tools.checkstyle>10.3.3</version.com.puppycrawl.tools.checkstyle>
+		<version.com.puppycrawl.tools.checkstyle>10.7.0</version.com.puppycrawl.tools.checkstyle>
 		<version.io.kokuwa.checkstyle>0.5.6</version.io.kokuwa.checkstyle>
 
 		<!-- dependencies -->
 
 		<version.ch.qos.logback>1.2.11</version.ch.qos.logback>
 		<version.ch.qos.logback.contrib>0.1.5</version.ch.qos.logback.contrib>
-		<version.io.micronaut>3.6.1</version.io.micronaut>
+		<version.io.micronaut>3.8.5</version.io.micronaut>
 
 	</properties>
 
@@ -205,6 +200,11 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-checkstyle-plugin</artifactId>
 					<version>${version.org.apache.maven.plugins.checkstyle}</version>
+					<configuration>
+						<configLocation>checkstyle.xml</configLocation>
+						<suppressionsLocation>checkstyle-suppression.xml</suppressionsLocation>
+						<includeTestSourceDirectory>true</includeTestSourceDirectory>
+					</configuration>
 					<dependencies>
 						<dependency>
 							<groupId>com.puppycrawl.tools</groupId>
@@ -242,7 +242,7 @@
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>${version.org.apache.maven.plugins.dependency_}</version>
+					<version>${version.org.apache.maven.plugins.dependency}</version>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>