From 70bdf1a7a0bcb5261a5c4ac69fcf492f1c5ddf93 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Tue, 16 May 2023 13:25:43 +0200 Subject: [PATCH] Prepare version 4.x for current slf4j/logback/micronaut versions (#147) --- .github/dependabot.yml | 11 +++++++++++ README.md | 8 ++++---- pom.xml | 4 ++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 845e2ce..3488946 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,17 @@ updates: # yamllint disable-line rule:quoted-strings time: "09:00" timezone: Europe/Berlin + - package-ecosystem: maven + directory: / + open-pull-requests-limit: 20 + schedule: + interval: monthly + day: monday + # github parses time without quotes to int + # yamllint disable-line rule:quoted-strings + time: "09:00" + timezone: Europe/Berlin + target-branch: 3.x ignore: # logback 1.3 and 1.4 are compatible with slf4j 2.x only and not supported right now - dependency-name: ch.qos.logback:logback-classic diff --git a/README.md b/README.md index 2c09982..00cca28 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@ [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/micronaut-logging.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.micronaut/micronaut-logging.svg?label=Maven%20Central)](https://central.sonatype.com/namespace/io.kokuwa.micronaut) -[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=main&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3Amain) -[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=4.x&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3A4.x) +[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=3.x&label=3.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3A3.x) +[![CI](https://img.shields.io/github/actions/workflow/status/kokuwaio/micronaut-logging/ci.yaml?branch=main&label=4.x)](https://github.com/kokuwaio/micronaut-logging/actions/workflows/ci.yaml?query=branch%3Amain) Include in your `pom.xml`: @@ -41,8 +41,8 @@ Or use in `dependencyManagement` in `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 (WIP) +* Version [3.x](https://github.com/kokuwaio/micronaut-logging/tree/3.x) is based on SLF4J 1.7 & Logback 1.2 & Micronaut 3.x +* Version [4.x](https://github.com/kokuwaio/micronaut-logging/tree/main) is based on SLF4J 2.0 & Logback 1.4 & Micronaut 4.x * [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 ba4deeb..a16aadb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ io.kokuwa.micronaut micronaut-logging - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT Logging Support for Micronaut Enhanced logging using MDC or request header. @@ -102,7 +102,7 @@ 1.2.12 0.1.5 - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT 3.9.1 3.11.0 1.7.36