From 2de775d83ae161b550916defed6d9e84a5081f43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:29:51 +0200 Subject: [PATCH] Bump quarkus.version from 3.13.3 to 3.14.0 (#407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps `quarkus.version` from 3.13.3 to 3.14.0. Updates `io.quarkus:quarkus-bom` from 3.12.3 to 3.14.0 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.12.3...3.14.0) Updates `io.quarkus:quarkus-extension-processor` from 3.12.3 to 3.14.0 Updates `io.quarkus:quarkus-extension-maven-plugin` from 3.12.3 to 3.14.0 - [Release notes](https://github.com/quarkusio/quarkus/releases) - [Commits](https://github.com/quarkusio/quarkus/compare/3.12.3...3.14.0) --- updated-dependencies: - dependency-name: io.quarkus:quarkus-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-processor dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkus:quarkus-extension-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Migrate legacy @ConfigRoot to new approach --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Łukasz Witkowski --- .github/workflows/maven-regression.yaml | 2 +- .../deployment/ProblemBuildConfig.java | 20 +++++++++++-------- .../problem/deployment/ProblemProcessor.java | 4 ++-- integration-test/pom.xml | 7 +++++++ pom.xml | 2 +- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.github/workflows/maven-regression.yaml b/.github/workflows/maven-regression.yaml index b515724d..110e92ce 100644 --- a/.github/workflows/maven-regression.yaml +++ b/.github/workflows/maven-regression.yaml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - quarkus-version: [ "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12" ] + quarkus-version: [ "3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13" ] json-provider: [ "jsonb-classic", "jackson-classic" ] steps: diff --git a/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemBuildConfig.java b/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemBuildConfig.java index 90b621a3..46fb12c4 100644 --- a/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemBuildConfig.java +++ b/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemBuildConfig.java @@ -1,22 +1,26 @@ package com.tietoevry.quarkus.resteasy.problem.deployment; -import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithDefault; +import io.smallrye.config.WithName; import java.util.Set; -@ConfigRoot(name = "resteasy.problem", phase = ConfigPhase.BUILD_TIME) -public class ProblemBuildConfig { +@ConfigMapping(prefix = "quarkus.resteasy.problem") +@ConfigRoot(phase = ConfigPhase.BUILD_TIME) +public interface ProblemBuildConfig { /** * MDC properties that should be included in problem responses. */ - @ConfigItem(defaultValue = "uuid") - public Set includeMdcProperties; + @WithDefault("uuid") + Set includeMdcProperties(); /** - * Whether or not metrics should be enabled if quarkus-smallrye-metrics is used. + * Whether metrics should be enabled if quarkus-smallrye-metrics is used. */ - @ConfigItem(name = "metrics.enabled", defaultValue = "false") - public boolean metricsEnabled; + @WithName("metrics.enabled") + @WithDefault("false") + boolean metricsEnabled(); } diff --git a/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemProcessor.java b/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemProcessor.java index 1b6bb88e..201322d6 100644 --- a/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemProcessor.java +++ b/deployment/src/main/java/com/tietoevry/quarkus/resteasy/problem/deployment/ProblemProcessor.java @@ -154,13 +154,13 @@ void resetRecorder(ProblemRecorder recorder, LiveReloadBuildItem liveReload) { @Record(RUNTIME_INIT) @BuildStep void setupMdc(ProblemRecorder recorder, ProblemBuildConfig config) { - recorder.configureMdc(config.includeMdcProperties); + recorder.configureMdc(config.includeMdcProperties()); } @Record(RUNTIME_INIT) @BuildStep(onlyIf = QuarkusSmallryeMetricsDetector.class) void setupMetrics(ProblemRecorder recorder, ProblemBuildConfig config) { - if (config.metricsEnabled) { + if (config.metricsEnabled()) { recorder.enableMetrics(); } } diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 5e214c51..cdbbdb9a 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -239,6 +239,13 @@ + + quarkus-3.13 + + 3.13.3 + + + native diff --git a/pom.xml b/pom.xml index d954b648..c20b7295 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ UTF-8 - 3.13.3 + 3.14.0 0.27.1 3.26.3 1.37