diff --git a/.github/project.yaml b/.github/project.yaml index 0a3ea50..39fcc44 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,5 +1,5 @@ name: Quarkus Commons release: - current-version: "1.0.14" - next-version: "1.0.15-SNAPSHOT" + current-version: "1.1.2" + next-version: "1.1.3-SNAPSHOT" diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 1272b20..25b11b2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -25,12 +25,12 @@ jobs: steps: - name: Checkout the code - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v5 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK 21 - uses: https://github.com/actions/setup-java@v4 + uses: https://github.com/actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' @@ -48,7 +48,7 @@ jobs: - name: Cache Maven Repository id: cache-maven - uses: actions/cache@v4 + uses: https://github.com/actions/cache@v4 with: path: ~/.m2/repository # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch. @@ -58,7 +58,7 @@ jobs: ${{ steps.cache-key.outputs.m2-monthly-cache-key }} - name: Configure Maven CI/CD settings - uses: https://github.com/s4u/maven-settings-action@v3.1.0 + uses: https://github.com/s4u/maven-settings-action@v4.0.0 with: servers: | [{ diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3043398..4ac7764 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout the code - uses: actions/checkout@v4 + uses: https://github.com/actions/checkout@v5 - name: Retrieve project metadata uses: https://github.com/radcortez/project-metadata-action@main @@ -60,7 +60,7 @@ jobs: git config --global user.signingkey ${SSH_DIR}/id_rsa - name: Set up JDK 21 - uses: https://github.com/actions/setup-java@v4 + uses: https://github.com/actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' @@ -78,7 +78,7 @@ jobs: - name: Cache Maven Repository id: cache-maven - uses: actions/cache@v4 + uses: https://github.com/actions/cache@v4 with: path: ~/.m2/repository # The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch. diff --git a/.github/workflows/validate-versions.yaml b/.github/workflows/validate-versions.yaml index 7828cbe..5050f4a 100644 --- a/.github/workflows/validate-versions.yaml +++ b/.github/workflows/validate-versions.yaml @@ -11,7 +11,7 @@ jobs: steps: - name: Checkout the code - uses: https://github.com/actions/checkout@v4 + uses: https://github.com/actions/checkout@v5 - name: Retrieve project metadata uses: https://github.com/radcortez/project-metadata-action@main diff --git a/pom.xml b/pom.xml index 7b9c2d8..55d6b3a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT pom @@ -22,15 +22,15 @@ quarkus-bom io.quarkus.platform - 3.26.3 + 3.28.4 - 3.14.0 - 3.5.3 - 2.46.1 + 3.14.1 + 3.5.4 + 3.0.0 2.72.0 - 0.8.13 - 3.4.0 + 0.8.14 + 3.5.0 3.1.1 3.3.1 @@ -41,10 +41,10 @@ true - 5.1.0 + 5.1.1 - 3.27.4 + 3.27.6 @@ -74,7 +74,7 @@ scm:git:ssh://git@git-ssh.kvant.cloud:2222/phoenix-oss/quarkus-commons.git scm:git:ssh://git@git-ssh.kvant.cloud:2222/phoenix-oss/quarkus-commons.git https://git.kvant.cloud/phoenix-oss/quarkus-commons.git - 1.0.14 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 7b69711..7002853 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index aeb3a67..f22f45c 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-client-logger diff --git a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java index 24fa05f..ff72f6f 100644 --- a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java +++ b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java @@ -6,7 +6,7 @@ import jakarta.ws.rs.core.HttpHeaders; import java.util.Optional; import java.util.Set; -@ConfigMapping(prefix = "phoenix.client-logger") +@ConfigMapping(prefix = "phoenix-oss.client-logger") public interface RedactingClientLoggerConfiguration { Headers headers(); diff --git a/quarkus-client-logger/src/test/resources/application.yaml b/quarkus-client-logger/src/test/resources/application.yaml index a02f41d..0108460 100644 --- a/quarkus-client-logger/src/test/resources/application.yaml +++ b/quarkus-client-logger/src/test/resources/application.yaml @@ -12,7 +12,7 @@ quarkus: "ch.phoenix.oss.quarkus.commons.client.logger": level: DEBUG -phoenix: +phoenix-oss: client-logger: headers: redact: diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 62dc376..eb5d94b 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index a18cebc..9451cc2 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index acfcb1c..b28af74 100644 --- a/quarkus-message-digest-service/pom.xml +++ b/quarkus-message-digest-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-message-digest-service/src/main/java/ch/phoenix/oss/quarkus/commons/digest/MessageDigestConfiguration.java b/quarkus-message-digest-service/src/main/java/ch/phoenix/oss/quarkus/commons/digest/MessageDigestConfiguration.java index e30fdf6..a17da7d 100644 --- a/quarkus-message-digest-service/src/main/java/ch/phoenix/oss/quarkus/commons/digest/MessageDigestConfiguration.java +++ b/quarkus-message-digest-service/src/main/java/ch/phoenix/oss/quarkus/commons/digest/MessageDigestConfiguration.java @@ -3,7 +3,7 @@ package ch.phoenix.oss.quarkus.commons.digest; import io.smallrye.config.ConfigMapping; import io.smallrye.config.WithDefault; -@ConfigMapping(prefix = "phoenix.message-digest") +@ConfigMapping(prefix = "phoenix-oss.message-digest") public interface MessageDigestConfiguration { @WithDefault("SHA-256") diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 32cb8f6..c178a94 100644 --- a/quarkus-random-number-generator/pom.xml +++ b/quarkus-random-number-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-table-generator/pom.xml b/quarkus-table-generator/pom.xml index 475c6f7..e5ce9a1 100644 --- a/quarkus-table-generator/pom.xml +++ b/quarkus-table-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-table-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 1688b05..0e5cb86 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingConfiguration.java b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingConfiguration.java index 1093348..dc05e6d 100644 --- a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingConfiguration.java +++ b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingConfiguration.java @@ -7,7 +7,7 @@ import jakarta.ws.rs.core.HttpHeaders; import java.util.Optional; import java.util.Set; -@ConfigMapping(prefix = "phoenix.commons.tracing") +@ConfigMapping(prefix = "phoenix-oss.tracing") public interface TracingConfiguration { RequestFilterConfiguration requestFilter(); diff --git a/quarkus-tracing-service/src/test/resources/application.yaml b/quarkus-tracing-service/src/test/resources/application.yaml index 3c6bb6f..3853f31 100644 --- a/quarkus-tracing-service/src/test/resources/application.yaml +++ b/quarkus-tracing-service/src/test/resources/application.yaml @@ -23,17 +23,16 @@ quarkus: category: "ch.phoenix.oss.quarkus.commons.tracing": level: TRACE - phoenix: - commons: - tracing: - request-filter: - path: - include-raw: true - headers: - redact: - - AUTHORIZATION - - X-SOMETHING-ELSE - query: - include-raw: true - redact: - - ACCESS_TOKEN \ No newline at end of file + phoenix-oss: + tracing: + request-filter: + path: + include-raw: true + headers: + redact: + - AUTHORIZATION + - X-SOMETHING-ELSE + query: + include-raw: true + redact: + - ACCESS_TOKEN \ No newline at end of file diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index d2aaadc..059b254 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.14 + 1.1.3-SNAPSHOT quarkus-uuid-generator