From 1f38615a156d249bd430366859f1a959ec9b0a0c Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Sat, 28 Jun 2025 03:06:34 +0000 Subject: [PATCH 01/35] chore: prepare for next development iteration [skip ci] --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a975eaa..aa04984 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT pom @@ -72,7 +72,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.3 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 6a66725..76ee4ad 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 51131fd..40b429b 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index efe3c1b..2d1f869 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 1a5db9a..668ccf7 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.3 + 1.0.4-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 3553726..d86279f 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.3 + 1.0.4-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 5f8440f..75a714b 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 1780637..8dab532 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.3 + 1.0.4-SNAPSHOT quarkus-uuid-generator From e6ec3f57f8640101ca1e48a8d2f8cefd9fed3d5e Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 4 Jul 2025 18:34:48 +0200 Subject: [PATCH 02/35] feat: add quarkus-client-logger module with RedactingClientLogger --- pom.xml | 1 + .../client/logger/RedactingClientLogger.java | 106 ++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java diff --git a/pom.xml b/pom.xml index aa04984..a0d09c6 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,7 @@ quarkus-audit-tools + quarkus-client-logger quarkus-clock-service quarkus-json-service quarkus-message-digest-service diff --git a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java new file mode 100644 index 0000000..3061c09 --- /dev/null +++ b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java @@ -0,0 +1,106 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.vertx.core.Handler; +import io.vertx.core.MultiMap; +import io.vertx.core.buffer.Buffer; +import io.vertx.core.http.HttpClientRequest; +import io.vertx.core.http.HttpClientResponse; +import jakarta.enterprise.context.Dependent; +import jakarta.ws.rs.core.HttpHeaders; +import java.util.Map; +import org.jboss.logging.Logger; +import org.jboss.resteasy.reactive.client.api.ClientLogger; + +/** + * This is based on org.jboss.resteasy.reactive.client.logging.DefaultClientLogger, + * with the only change being that the value of "Authorization" header, when present, + * is redacted. + */ +@Dependent +public class RedactingClientLogger implements ClientLogger { + + private static final Logger log = Logger.getLogger(RedactingClientLogger.class); + + private int bodySize; + + @Override + public void setBodySize(int bodySize) { + this.bodySize = bodySize; + } + + @Override + public void logResponse(HttpClientResponse response, boolean redirect) { + if (!log.isDebugEnabled()) { + return; + } + + //noinspection Convert2Lambda + response.bodyHandler(new Handler<>() { + @Override + public void handle(Buffer body) { + log.debugf( + "%s: %s %s, Status[%d %s], Headers[%s], Body:\n%s", + redirect ? "Redirect" : "Response", + response.request().getMethod(), + response.request().absoluteURI(), + response.statusCode(), + response.statusMessage(), + asString(response.headers()), + bodyToString(body)); + } + }); + } + + @Override + public void logRequest(HttpClientRequest request, Buffer body, boolean omitBody) { + if (!log.isDebugEnabled()) { + return; + } + if (omitBody) { + log.debugf( + "Request: %s %s Headers[%s], Body omitted", + request.getMethod(), request.absoluteURI(), asString(request.headers())); + } else if (body == null || body.length() == 0) { + log.debugf( + "Request: %s %s Headers[%s], Empty body", + request.getMethod(), request.absoluteURI(), asString(request.headers())); + } else { + log.debugf( + "Request: %s %s Headers[%s], Body:\n%s", + request.getMethod(), request.absoluteURI(), asString(request.headers()), bodyToString(body)); + } + } + + private String bodyToString(Buffer body) { + if (body == null) { + return ""; + } else if (bodySize <= 0) { + return body.toString(); + } else { + String bodyAsString = body.toString(); + return bodyAsString.substring(0, Math.min(bodySize, bodyAsString.length())); + } + } + + private String asString(MultiMap headers) { + if (headers.isEmpty()) { + return ""; + } + StringBuilder sb = new StringBuilder((headers.size() * (6 + 1 + 6)) + + (headers.size() - 1)); // this is a very rough estimate of a result like 'key1=value1 key2=value2' + boolean isFirst = true; + for (Map.Entry entry : headers) { + if (isFirst) { + isFirst = false; + } else { + sb.append(' '); + } + + var key = entry.getKey(); + var value = HttpHeaders.AUTHORIZATION.equalsIgnoreCase(key) ? "*****" : entry.getValue(); + + sb.append(key).append('=').append(value); + } + return sb.toString(); + } +} From cccd9dde98c4aa5fbf64931c33800dd2b1234161 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 4 Jul 2025 18:36:27 +0200 Subject: [PATCH 03/35] fix(deps): update quarkus.platform.version to 3.24.2 --- pom.xml | 2 +- quarkus-client-logger/pom.xml | 55 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 quarkus-client-logger/pom.xml diff --git a/pom.xml b/pom.xml index a0d09c6..72b43a0 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ quarkus-bom io.quarkus.platform - 3.24.1 + 3.24.2 3.14.0 diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml new file mode 100644 index 0000000..2e055f1 --- /dev/null +++ b/quarkus-client-logger/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + + ch.phoenix.oss + quarkus-commons + 1.0.4-SNAPSHOT + + + quarkus-client-logger + jar + + + + io.quarkus + quarkus-rest-client + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-plugin.version} + + + jacoco-check + + check + + test + + ${project.build.directory}/jacoco-quarkus.exec + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + 1 + + + + + + + + + + + + From d7b6286546b33ec581ebd6ac0d92b611e5cd5055 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 4 Jul 2025 18:46:01 +0200 Subject: [PATCH 04/35] chore: bump version to 1.0.4 --- .github/project.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yaml b/.github/project.yaml index 3005d38..8d17764 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,6 +1,6 @@ name: Quarkus Commons release: - current-version: "1.0.3" - next-version: "1.0.4-SNAPSHOT" + current-version: "1.0.4" + next-version: "1.0.5-SNAPSHOT" From 3bbdf7015abb7ff433399e57a92688cc7bd6fce3 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Fri, 4 Jul 2025 16:47:32 +0000 Subject: [PATCH 05/35] chore: release 1.0.4 --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 72b43a0..2814070 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 pom @@ -73,7 +73,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 - HEAD + 1.0.4 diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 76ee4ad..e4c9f0d 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 2e055f1..d9a3e4d 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 40b429b..16bd522 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 2d1f869..a1706a3 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 668ccf7..99857d0 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.4-SNAPSHOT + 1.0.4 quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index d86279f..ec5ccf8 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.4-SNAPSHOT + 1.0.4 quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 75a714b..2d4e33e 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 8dab532..bb65687 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4-SNAPSHOT + 1.0.4 quarkus-uuid-generator From 4b20f998567d0da8e8982211272e50df96b73043 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Fri, 4 Jul 2025 16:47:33 +0000 Subject: [PATCH 06/35] chore: prepare for next development iteration [skip ci] --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 2814070..80aacd9 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT pom @@ -73,7 +73,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.4 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index e4c9f0d..420d24e 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index d9a3e4d..b6af2c3 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 16bd522..92392f0 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index a1706a3..afc346d 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 99857d0..9f66400 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.4 + 1.0.5-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index ec5ccf8..7fe3fbf 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.4 + 1.0.5-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 2d4e33e..d3b48ed 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index bb65687..4f7bef1 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.4 + 1.0.5-SNAPSHOT quarkus-uuid-generator From 4d20a75f42e022b3e0ea734883ebaee3abdd6d9f Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Sat, 12 Jul 2025 18:18:59 +0200 Subject: [PATCH 07/35] fix(deps): update quarkus.platform.version to 3.24.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80aacd9..7706ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ quarkus-bom io.quarkus.platform - 3.24.2 + 3.24.3 3.14.0 From 33e10b7a40a02f9c796318619244ecf5a338a086 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Sat, 12 Jul 2025 18:19:18 +0200 Subject: [PATCH 08/35] fix(deps): update palantir-java-format.version to 2.70.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7706ed1..60f9b8f 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 3.14.0 3.5.3 2.44.4 - 2.66.0 + 2.70.0 0.8.13 3.3.1 3.1.1 From 0fd62decaf7a2707dd757ae439220fb771ec9c9a Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Sat, 12 Jul 2025 18:20:23 +0200 Subject: [PATCH 09/35] feat(deps): update com.diffplug.spotless:spotless-maven-plugin to 2.45.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60f9b8f..91f6837 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.14.0 3.5.3 - 2.44.4 + 2.45.0 2.70.0 0.8.13 3.3.1 From 6d95a3b1230a06f44404da320f5fba74cabf8b6d Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Sat, 12 Jul 2025 18:26:17 +0200 Subject: [PATCH 10/35] chore: bump version to 1.0.5 --- .github/project.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/project.yaml b/.github/project.yaml index 8d17764..513c623 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,6 +1,5 @@ name: Quarkus Commons release: - current-version: "1.0.4" - next-version: "1.0.5-SNAPSHOT" + current-version: "1.0.5" + next-version: "1.0.6-SNAPSHOT" - From 2d1f9a14176c7d2f7f2081c716f6bac24ac47337 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Sat, 12 Jul 2025 16:29:58 +0000 Subject: [PATCH 11/35] chore: release 1.0.5 --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 91f6837..4b8f236 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 pom @@ -73,7 +73,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 - HEAD + 1.0.5 diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 420d24e..2c78b9b 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index b6af2c3..53754d9 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 92392f0..3b0953d 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index afc346d..d516d62 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 9f66400..584d87b 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.5-SNAPSHOT + 1.0.5 quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 7fe3fbf..0dab4fc 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.5-SNAPSHOT + 1.0.5 quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index d3b48ed..7f046aa 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 4f7bef1..ca0280d 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5-SNAPSHOT + 1.0.5 quarkus-uuid-generator From 880df82728cacfd72239d4ee05ae2bbb1531af1a Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Sat, 12 Jul 2025 16:29:59 +0000 Subject: [PATCH 12/35] chore: prepare for next development iteration [skip ci] --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 4b8f236..5e7a8ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT pom @@ -73,7 +73,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.5 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 2c78b9b..6722361 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 53754d9..f213f78 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 3b0953d..a772de5 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index d516d62..71a54cd 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 584d87b..bca71c6 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.5 + 1.0.6-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 0dab4fc..10b74cb 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.5 + 1.0.6-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 7f046aa..d3c4157 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index ca0280d..16a3f3a 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.5 + 1.0.6-SNAPSHOT quarkus-uuid-generator From 8aad75a493d09465aacfe36d5d75da6d6e34e060 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 18 Jul 2025 09:43:50 +0200 Subject: [PATCH 13/35] fix(deps): update quarkus.platform.version to 3.24.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e7a8ee..1808f9d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ quarkus-bom io.quarkus.platform - 3.24.3 + 3.24.4 3.14.0 From a5e0c2672b06980fd0aac7b39f3e2bf418bf6b49 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 18 Jul 2025 10:26:00 +0200 Subject: [PATCH 14/35] ci(github-actions): revamp build.yaml to trigger on tags and do proper validation of version --- .github/workflows/build.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b32c3db..f99f691 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,6 +4,8 @@ on: push: branches: - "main" + tags: + - '[0-9]+.[0-9]+.[0-9]+' paths-ignore: - '.gitattributes' - '.gitignore' @@ -12,6 +14,7 @@ on: - 'docs/**' - 'README.md' pull_request: + workflow_dispatch: env: COMMON_MAVEN_OPTS: "-e -B --fae" @@ -73,6 +76,17 @@ jobs: - name: Make maven wrapper executable run: chmod +x mvnw + - name: Validate tag + if: startsWith(github.ref, 'refs/tags/') + run: | + TAG_NAME="${GITHUB_REF#refs/tags/}" + PROJECT_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout) + + if [[ "$PROJECT_VERSION" != "$TAG_NAME" ]]; then + echo "::error::pom.xml version '$PROJECT_VERSION' does not match tag '$TAG_NAME'" + exit 1 + fi + - name: Download dependencies run: ./mvnw $COMMON_MAVEN_OPTS quarkus:go-offline From 5e8f8fefa8f11359886fe9a44307e4b121c68692 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 18 Jul 2025 14:01:02 +0200 Subject: [PATCH 15/35] ci(github-actions): fix jars not being published on tags --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f99f691..bf8a636 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -101,5 +101,5 @@ jobs: run: ./mvnw $COMMON_MAVEN_OPTS org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=quarkus-commons -Dsonar.projectName='quarkus-commons' -Dsonar.coverage.jacoco.xmlReportPaths=../**/target/jacoco-report/jacoco.xml - name: Publish jars - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') run: ./mvnw $COMMON_MAVEN_OPTS deploy -Dmaven.test.skip=true -Dmaven.javadoc.skip=true \ No newline at end of file From 2d2383581077a50e481957abad83fa450fe226e8 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Fri, 18 Jul 2025 14:01:19 +0200 Subject: [PATCH 16/35] chore: bump version to 1.0.6 --- .github/project.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yaml b/.github/project.yaml index 513c623..b1c8594 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,5 +1,5 @@ name: Quarkus Commons release: - current-version: "1.0.5" - next-version: "1.0.6-SNAPSHOT" + current-version: "1.0.6" + next-version: "1.0.7-SNAPSHOT" From a0939d7729f15e72a47feffd1ed34020f9045996 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Fri, 18 Jul 2025 12:03:02 +0000 Subject: [PATCH 17/35] chore: release 1.0.6 --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 1808f9d..402ec46 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 pom @@ -73,7 +73,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 - HEAD + 1.0.6 diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 6722361..b63e3f7 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index f213f78..58e2aa9 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index a772de5..c84c0c6 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 71a54cd..8739a83 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index bca71c6..c5bf009 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.6-SNAPSHOT + 1.0.6 quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 10b74cb..8b1d028 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.6-SNAPSHOT + 1.0.6 quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index d3c4157..5cd4ae6 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 16a3f3a..c510a6f 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6-SNAPSHOT + 1.0.6 quarkus-uuid-generator From fc140833d5d536b0236fa242ee2ccb63cea63496 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Fri, 18 Jul 2025 12:03:03 +0000 Subject: [PATCH 18/35] chore: prepare for next development iteration [skip ci] --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 402ec46..80a246e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT pom @@ -73,7 +73,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.6 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index b63e3f7..f491142 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 58e2aa9..81aa2e0 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index c84c0c6..59c15ae 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 8739a83..22775c3 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index c5bf009..b7e365d 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.6 + 1.0.7-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 8b1d028..5e9f0e0 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.6 + 1.0.7-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 5cd4ae6..abcaf25 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index c510a6f..a67e844 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.6 + 1.0.7-SNAPSHOT quarkus-uuid-generator From ed362d84b8395fdc429ac91c71c04d78e89b99a3 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Tue, 22 Jul 2025 22:30:15 +0200 Subject: [PATCH 19/35] chore(maven): remove skip ci from release message --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80a246e..a4ee2d5 100644 --- a/pom.xml +++ b/pom.xml @@ -196,7 +196,7 @@ @{project.version} mvnw chore: release @{releaseLabel} - chore: prepare for next development iteration [skip ci] + chore: prepare for next development iteration true From 35d4e29a57bc0d4cb52b46a506e483f3605f68e2 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Tue, 22 Jul 2025 22:30:44 +0200 Subject: [PATCH 20/35] feat(deps): update palantir-java-format.version to 2.72.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a4ee2d5..b14da0c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ 3.14.0 3.5.3 2.45.0 - 2.70.0 + 2.72.0 0.8.13 3.3.1 3.1.1 From cf81524d86ec674bf679b748ebaf3939d18816eb Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Tue, 22 Jul 2025 22:30:56 +0200 Subject: [PATCH 21/35] feat(deps): update com.diffplug.spotless:spotless-maven-plugin to 2.46.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b14da0c..36a20d6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.14.0 3.5.3 - 2.45.0 + 2.46.1 2.72.0 0.8.13 3.3.1 From ca915c4bf5667e97a138c725851e2010e777d9f2 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Tue, 22 Jul 2025 22:31:39 +0200 Subject: [PATCH 22/35] feat(deps): update io.smallrye:jandex-maven-plugin to 3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36a20d6..8e88778 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ 2.46.1 2.72.0 0.8.13 - 3.3.1 + 3.4.0 3.1.1 3.3.1 From 7d2cda5b2032d2fd77dc163cdd54ab262b7964b6 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Tue, 22 Jul 2025 22:36:43 +0200 Subject: [PATCH 23/35] docs(README): update sonarqube badges --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6f32452..1cfb1f7 100644 --- a/README.md +++ b/README.md @@ -2,12 +2,12 @@ Quarkus Commons =============== [![Java version](https://img.shields.io/badge/Java%20version-21-brightgreen)](https://openjdk.org/projects/jdk/21/) -[![Coverage](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=coverage&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) -[![Duplicated Lines (%)](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=duplicated_lines_density&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) -[![Quality Gate Status](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=alert_status&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) -[![Security Rating](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=security_rating&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) -[![Reliability Rating](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=reliability_rating&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) -[![Maintainability Rating](https://sonarqube.pub.production.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=sqale_rating&token=sqb_b39e0a05145228a10eb07d8771fd073297800645)](https://sonarqube.pub.production.kvant.cloud/dashboard?id=quarkus-commons) +[![Coverage](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=coverage&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) +[![Duplicated Lines (%)](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=duplicated_lines_density&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) +[![Quality Gate Status](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=alert_status&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) +[![Security Rating](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=security_rating&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) +[![Reliability Rating](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=reliability_rating&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) +[![Maintainability Rating](https://sonarqube.pub.basel.kvant.cloud/api/project_badges/measure?project=quarkus-commons&metric=sqale_rating&token=sqb_b56d9ea175c7f51f522ce63acd7fe7807643ac9e)](https://sonarqube.pub.basel.kvant.cloud/dashboard?id=quarkus-commons) # Introduction From 331a830c2bf92fd4e109bec88ea88cbb25910744 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 23 Jul 2025 14:27:42 +0200 Subject: [PATCH 24/35] refactor: apply some suggestions from SonarQube --- .../quarkus/commons/audit/RevisionTest.java | 32 +++++++++++++++++-- .../quarkus/commons/tracing/ActorTest.java | 2 +- .../commons/tracing/QueryParamTest.java | 2 +- .../quarkus/commons/tracing/RawPathTest.java | 2 +- .../quarkus/commons/tracing/RedactedTest.java | 2 +- 5 files changed, 33 insertions(+), 7 deletions(-) diff --git a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java index 1b08c56..61c3743 100644 --- a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java +++ b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java @@ -17,12 +17,38 @@ class RevisionTest { var r2 = new Revision(); r2.rev = 1; - assertThat(r1).as("Revisions should be equal").isEqualTo(r2); + var r3 = new Revision(); + r3.rev = 2; + + assertThat(r1) + .as("Revisions equality should should match expected value") + .isEqualTo(r1) + .isEqualTo(r2) + .isNotEqualTo(r3) + .isNotEqualTo(new Object()); } @Test - void testHashCode() {} + void testHashCode() { + var r1 = new Revision(); + r1.rev = 123; + + var r2 = new Revision(); + r2.rev = 123; + + var r3 = new Revision(); + r3.rev = 2; + + assertThat(r1.hashCode()).isEqualTo(123).isEqualTo(r2.hashCode()).isNotEqualTo(r3.hashCode()); + } @Test - void testToString() {} + void testToString() { + var rev = new Revision(); + rev.rev = 1; + + assertThat(rev.toString()) + .as("Revision's toString should match expected value") + .isEqualTo("Revision{rev=1}"); + } } diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/ActorTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/ActorTest.java index a173b72..8ab52eb 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/ActorTest.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/ActorTest.java @@ -12,7 +12,7 @@ import io.restassured.http.ContentType; import org.junit.jupiter.api.Test; @QuarkusTest -public class ActorTest { +class ActorTest { @InjectSpy TracingService tracingService; diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/QueryParamTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/QueryParamTest.java index 7378040..10b3894 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/QueryParamTest.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/QueryParamTest.java @@ -12,7 +12,7 @@ import io.restassured.http.ContentType; import org.junit.jupiter.api.Test; @QuarkusTest -public class QueryParamTest { +class QueryParamTest { @InjectSpy TracingService tracingService; diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RawPathTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RawPathTest.java index 96d8956..e3579ba 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RawPathTest.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RawPathTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; @QuarkusTest @TestProfile(Test2Profile.class) -public class RawPathTest { +class RawPathTest { @InjectSpy TracingService tracingService; diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RedactedTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RedactedTest.java index 34658e2..c928917 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RedactedTest.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RedactedTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; @QuarkusTest @TestProfile(Test2Profile.class) -public class RedactedTest { +class RedactedTest { @InjectSpy TracingService tracingService; From bc0110cc29277d342e979cebe24e1e24bb7c6a05 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Thu, 24 Jul 2025 11:11:53 +0200 Subject: [PATCH 25/35] chore: more sonarqube improvements, rename tracing service method --- .../DefaultRevisionContextProviderTest.java | 1 - .../quarkus/commons/audit/RevisionTest.java | 5 +- .../commons/tracing/TracingService.java | 2 +- .../commons/tracing/TracingServiceImpl.java | 2 +- .../commons/tracing/RoutePatternTest.java | 205 ++++-------------- .../tracing/TracingServiceImplTest.java | 98 +++++++++ .../tracing/resource/SlashResource.java | 12 +- 7 files changed, 151 insertions(+), 174 deletions(-) create mode 100644 quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImplTest.java diff --git a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/DefaultRevisionContextProviderTest.java b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/DefaultRevisionContextProviderTest.java index 5ad9ff7..8ef3a73 100644 --- a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/DefaultRevisionContextProviderTest.java +++ b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/DefaultRevisionContextProviderTest.java @@ -1,7 +1,6 @@ package ch.phoenix.oss.quarkus.commons.audit; import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.mockStatic; import io.quarkus.test.junit.QuarkusTest; diff --git a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java index 61c3743..d0f5d1f 100644 --- a/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java +++ b/quarkus-audit-tools/src/test/java/ch/phoenix/oss/quarkus/commons/audit/RevisionTest.java @@ -1,7 +1,6 @@ package ch.phoenix.oss.quarkus.commons.audit; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; import io.quarkus.test.junit.QuarkusTest; import org.junit.jupiter.api.Test; @@ -47,8 +46,6 @@ class RevisionTest { var rev = new Revision(); rev.rev = 1; - assertThat(rev.toString()) - .as("Revision's toString should match expected value") - .isEqualTo("Revision{rev=1}"); + assertThat(rev).as("Revision's toString should match expected value").hasToString("Revision{rev=1}"); } } diff --git a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingService.java b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingService.java index 2b1ac38..812867d 100644 --- a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingService.java +++ b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingService.java @@ -8,7 +8,7 @@ public interface TracingService { String getActor(); - String getRequestPath(); + String getRequestPathRaw(); String getRequestMethod(); diff --git a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImpl.java b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImpl.java index b5f295b..d46f684 100644 --- a/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImpl.java +++ b/quarkus-tracing-service/src/main/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImpl.java @@ -33,7 +33,7 @@ class TracingServiceImpl implements TracingService { } @Override - public String getRequestPath() { + public String getRequestPathRaw() { return (String) MDC.get(TracingConstants.REQUEST_PATH_RAW); } diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RoutePatternTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RoutePatternTest.java index 11f1689..156c0a4 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RoutePatternTest.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/RoutePatternTest.java @@ -1,5 +1,6 @@ package ch.phoenix.oss.quarkus.commons.tracing; +import static org.junit.jupiter.params.provider.Arguments.arguments; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.startsWith; import static org.mockito.Mockito.verify; @@ -10,7 +11,11 @@ import io.quarkus.test.junit.mockito.InjectSpy; import io.restassured.RestAssured; import io.restassured.http.ContentType; import java.util.Map; +import java.util.stream.Stream; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; @QuarkusTest class RoutePatternTest { @@ -18,12 +23,46 @@ class RoutePatternTest { @InjectSpy TracingService tracingService; - @Test - void getBlankResource() { - var route = "/"; - RestAssured.given().accept(ContentType.TEXT).when().get(route).then().statusCode(200); + static Stream get() { + return Stream.of( + arguments("/", Map.of()), + arguments("/leading-and-no-trailing", Map.of()), + arguments("/leading/{param}/{param2}", Map.of("param", "1", "param2", "2")), + arguments("/{param}/{param2}/trailing", Map.of("param", "1", "param2", "2")), + arguments("/leading-and-no-trailing/{param}", Map.of("param", "1")), + arguments("/leading-and-no-trailing/{param}/{param2}", Map.of("param", "1", "param2", "2")), + arguments("/leading-and-trailing", Map.of()), + arguments("/leading-and-trailing/{param}", Map.of("param", "1")), + arguments("/leading-and-trailing/{param}/{param2}", Map.of("param", "1", "param2", "2")), + arguments("/no-leading-and-no-trailing", Map.of()), + arguments("/no-leading-and-no-trailing/{param}", Map.of("param", "1")), + arguments("/no-leading-and-no-trailing/{param}/{param2}", Map.of("param", "1", "param2", "2")), + arguments("/no-leading-and-trailing", Map.of()), + arguments("/no-leading-and-trailing/{param}", Map.of("param", "1")), + arguments("/no-leading-and-trailing/{param}/{param2}", Map.of("param", "1", "param2", "2"))); + } - verifyGetTracing(route, Map.of()); + @MethodSource + @ParameterizedTest + void get(String route, Map pathParams) { + RestAssured.given() + .accept(ContentType.TEXT) + .when() + .get(route, pathParams) + .then() + .statusCode(200); + + verify(tracingService).trace("actor", "anonymous"); + verify(tracingService).trace("request.method", "GET"); + verify(tracingService).trace("request.route", route); + pathParams.forEach((key, value) -> verify(tracingService).trace("request.path.params." + key, value)); + verify(tracingService).trace("request.headers.accept", "text/plain"); + verify(tracingService).trace("request.headers.accept-encoding", "gzip,deflate"); + verify(tracingService).trace("request.headers.connection", "Keep-Alive"); + verify(tracingService).trace(eq("request.headers.host"), startsWith("localhost:")); + verify(tracingService).trace(eq("request.headers.user-agent"), startsWith("Apache-HttpClient")); + verify(tracingService).trace("request.client.ip", "127.0.0.1"); + verifyNoMoreInteractions(tracingService); } @Test @@ -45,160 +84,4 @@ class RoutePatternTest { verify(tracingService).trace("request.client.ip", "127.0.0.1"); verifyNoMoreInteractions(tracingService); } - - @Test - void getLeadingResource() { - var route = "/leading/{id}/{anotherId}"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("id", "1", "anotherId", "2")); - } - - @Test - void getTrailingResource() { - var route = "/{id}/{anotherId}/trailing"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("id", "1", "anotherId", "2")); - } - - @Test - void getLeadingAndNoTrailingResource() { - var route = "/leading-and-no-trailing"; - RestAssured.given().accept(ContentType.TEXT).when().get(route).then().statusCode(200); - - verifyGetTracing(route, Map.of()); - } - - @Test - void getLeadingAndNoTrailingWithSingleParamResource() { - var route = "/leading-and-no-trailing/{param}"; - RestAssured.given().accept(ContentType.TEXT).when().get(route, 1).then().statusCode(200); - - verifyGetTracing(route, Map.of("param", "1")); - } - - @Test - void getLeadingAndNoTrailingWithMultiParamResource() { - var route = "/leading-and-no-trailing/{param}/{param2}"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("param", "1", "param2", "2")); - } - - @Test - void getLeadingAndTrailingResource() { - var route = "/leading-and-trailing"; - RestAssured.given().accept(ContentType.TEXT).when().get(route).then().statusCode(200); - - verifyGetTracing(route, Map.of()); - } - - @Test - void getLeadingAndTrailingWithSingleParamResource() { - var route = "/leading-and-trailing/{param}"; - RestAssured.given().accept(ContentType.TEXT).when().get(route, 1).then().statusCode(200); - - verifyGetTracing(route, Map.of("param", "1")); - } - - @Test - void getLeadingAndTrailingWithMultiParamResource() { - var route = "/leading-and-trailing/{param}/{param2}"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("param", "1", "param2", "2")); - } - - @Test - void getNoLeadingAndNoTrailingResource() { - var route = "/no-leading-and-no-trailing"; - RestAssured.given().accept(ContentType.TEXT).when().get(route).then().statusCode(200); - - verifyGetTracing(route, Map.of()); - } - - @Test - void geNoLeadingAndNoTrailingWithSingleParamResource() { - var route = "/no-leading-and-no-trailing/{param}"; - RestAssured.given().accept(ContentType.TEXT).when().get(route, 1).then().statusCode(200); - - verifyGetTracing(route, Map.of("param", "1")); - } - - @Test - void getNoLeadingAndNoTrailingWithMultiParamResource() { - var route = "/no-leading-and-no-trailing/{param}/{param2}"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("param", "1", "param2", "2")); - } - - @Test - void getNoLeadingAndTrailingResource() { - var route = "/no-leading-and-trailing"; - RestAssured.given().accept(ContentType.TEXT).when().get(route).then().statusCode(200); - - verifyGetTracing(route, Map.of()); - } - - @Test - void getNoLeadingAndTrailingWithSingleParamResource() { - var route = "/no-leading-and-trailing/{param}"; - RestAssured.given().accept(ContentType.TEXT).when().get(route, 1).then().statusCode(200); - - verifyGetTracing(route, Map.of("param", "1")); - } - - @Test - void getNoLeadingAndTrailingWithMultiParamResource() { - var route = "/no-leading-and-trailing/{param}/{param2}"; - RestAssured.given() - .accept(ContentType.TEXT) - .when() - .get(route, 1, 2) - .then() - .statusCode(200); - - verifyGetTracing(route, Map.of("param", "1", "param2", "2")); - } - - private void verifyGetTracing(String route, Map pathParams) { - verify(tracingService).trace("actor", "anonymous"); - verify(tracingService).trace("request.method", "GET"); - verify(tracingService).trace("request.route", route); - pathParams.forEach((key, value) -> verify(tracingService).trace("request.path.params." + key, value)); - verify(tracingService).trace("request.headers.accept", "text/plain"); - verify(tracingService).trace("request.headers.accept-encoding", "gzip,deflate"); - verify(tracingService).trace("request.headers.connection", "Keep-Alive"); - verify(tracingService).trace(eq("request.headers.host"), startsWith("localhost:")); - verify(tracingService).trace(eq("request.headers.user-agent"), startsWith("Apache-HttpClient")); - verify(tracingService).trace("request.client.ip", "127.0.0.1"); - verifyNoMoreInteractions(tracingService); - } } diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImplTest.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImplTest.java new file mode 100644 index 0000000..f728e14 --- /dev/null +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/TracingServiceImplTest.java @@ -0,0 +1,98 @@ +package ch.phoenix.oss.quarkus.commons.tracing; + +import static org.assertj.core.api.Assertions.assertThat; + +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.instrumentation.annotations.WithSpan; +import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import org.jboss.logging.MDC; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +@QuarkusTest +class TracingServiceImplTest { + + @Inject + TracingService tracingService; + + @Inject + Span span; + + @BeforeEach + void setUp() { + MDC.clear(); + } + + @Test + void getActor() { + tracingService.trace("actor", "abc"); + assertThat(tracingService.getActor()) + .as("Actor should match expected value") + .isEqualTo("abc"); + } + + @Test + void getRequestPathRaw() { + tracingService.trace("request.path.raw", "/foo/bar"); + assertThat(tracingService.getRequestPathRaw()) + .as("Request Path Raw should match expected value") + .isEqualTo("/foo/bar"); + } + + @Test + void getRequestMethod() { + tracingService.trace("request.method", "GET"); + assertThat(tracingService.getRequestMethod()) + .as("Request Method should match expected value") + .isEqualTo("GET"); + } + + @Test + void getRequestId() { + tracingService.trace("request.headers.x-request-id", "ba458367-bfeb-46ba-87da-50b9343be8f9"); + assertThat(tracingService.getRequestId()) + .as("Request Id should match expected value") + .isEqualTo("ba458367-bfeb-46ba-87da-50b9343be8f9"); + } + + @Test + @WithSpan + void getTraceId() { + assertThat(tracingService.getTraceId()) + .as("Request Trace Id should match expected value") + .isEqualTo(span.getSpanContext().getTraceId()); + } + + @Test + @WithSpan + void getSpanId() { + assertThat(tracingService.getSpanId()) + .as("Request Span Id should match expected value") + .isEqualTo(span.getSpanContext().getSpanId()); + } + + @Test + void getClientIp() { + tracingService.trace("request.client.ip", "127.0.0.1"); + assertThat(tracingService.getClientIp()) + .as("Request Client Iü should match expected value") + .isEqualTo("127.0.0.1"); + } + + @Test + void getSchedulerJob() { + tracingService.trace("scheduler.job.name", "scheduler/abc"); + assertThat(tracingService.getSchedulerJob()) + .as("Scheduler Job Name should match expected value") + .isEqualTo("scheduler/abc"); + } + + @Test + void clearAll() { + tracingService.trace("aaa", "bbb"); + assertThat(MDC.get("aaa")).isEqualTo("bbb"); + tracingService.clearAll(); + assertThat(MDC.get("aaa")).isNull(); + } +} diff --git a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/resource/SlashResource.java b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/resource/SlashResource.java index 690c84a..8c8bdc7 100644 --- a/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/resource/SlashResource.java +++ b/quarkus-tracing-service/src/test/java/ch/phoenix/oss/quarkus/commons/tracing/resource/SlashResource.java @@ -10,14 +10,14 @@ import jakarta.ws.rs.core.MediaType; public class SlashResource { @GET - @Path("/leading/{id}/{anotherId}") - public String doubleLeading(int id, int anotherId) { - return "leading/" + id + "/" + anotherId; + @Path("/leading/{param}/{param2}") + public String doubleLeading(int param, int param2) { + return "leading/" + param + "/" + param2; } @GET - @Path("{id}/{anotherId}/trailing/") - public String doubleTrailing(int id, int anotherId) { - return id + "/" + anotherId + "/trailing"; + @Path("{param}/{param2}/trailing/") + public String doubleTrailing(int param, int param2) { + return param + "/" + param2 + "/trailing"; } } From d1acb1a0ee0851510170835e9c374c0cc1386f50 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Thu, 24 Jul 2025 11:53:27 +0200 Subject: [PATCH 26/35] chore(maven): enable jacoco rules for audit and tracing modules --- quarkus-audit-tools/pom.xml | 66 ++++++++++++++++----------------- quarkus-tracing-service/pom.xml | 34 +++++++++++++++++ 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index f491142..59c7367 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -51,38 +51,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-plugin.version} + + + jacoco-check + + check + + test + + ${project.build.directory}/jacoco-quarkus.exec + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + 1 + + + + + + + + + + diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index abcaf25..44dc2f9 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -41,4 +41,38 @@ + + + + org.jacoco + jacoco-maven-plugin + ${jacoco-plugin.version} + + + jacoco-check + + check + + test + + ${project.build.directory}/jacoco-quarkus.exec + + + BUNDLE + + + INSTRUCTION + COVEREDRATIO + 0.95 + + + + + + + + + + + From 21913626ad4831264e4c1d95a5c27ea6152eda8c Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 30 Jul 2025 14:44:49 +0200 Subject: [PATCH 27/35] feat(client-logger): redact headers based on configuration --- quarkus-client-logger/pom.xml | 12 ++++- .../logger/LowerCaseStringConverter.java | 10 ++++ .../client/logger/RedactingClientLogger.java | 21 +++++++-- .../RedactingClientLoggerConfiguration.java | 20 ++++++++ .../client/logger/InfoLevelProfile.java | 12 +++++ .../commons/client/logger/InfoLevelTest.java | 44 +++++++++++++++++ .../logger/RedactingClientLoggerTest.java | 47 +++++++++++++++++++ .../client/logger/ScopeNoneProfile.java | 12 +++++ .../commons/client/logger/ScopeNoneTest.java | 44 +++++++++++++++++ .../commons/client/logger/TestClient.java | 28 +++++++++++ .../commons/client/logger/TestResource.java | 21 +++++++++ .../src/test/resources/application.yaml | 20 ++++++++ 12 files changed, 286 insertions(+), 5 deletions(-) create mode 100644 quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/LowerCaseStringConverter.java create mode 100644 quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelProfile.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelTest.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerTest.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneProfile.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneTest.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestClient.java create mode 100644 quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestResource.java create mode 100644 quarkus-client-logger/src/test/resources/application.yaml diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 81aa2e0..9306ab4 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -16,6 +16,16 @@ io.quarkus quarkus-rest-client + + io.quarkus + quarkus-config-yaml + test + + + io.quarkus + quarkus-rest-jackson + test + @@ -40,7 +50,7 @@ INSTRUCTION COVEREDRATIO - 1 + 0.92 diff --git a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/LowerCaseStringConverter.java b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/LowerCaseStringConverter.java new file mode 100644 index 0000000..498e318 --- /dev/null +++ b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/LowerCaseStringConverter.java @@ -0,0 +1,10 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import org.eclipse.microprofile.config.spi.Converter; + +public class LowerCaseStringConverter implements Converter { + @Override + public String convert(String value) throws IllegalArgumentException, NullPointerException { + return value.toLowerCase(); + } +} diff --git a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java index 3061c09..cb2b63b 100644 --- a/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java +++ b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLogger.java @@ -6,23 +6,36 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClientRequest; import io.vertx.core.http.HttpClientResponse; import jakarta.enterprise.context.Dependent; -import jakarta.ws.rs.core.HttpHeaders; +import jakarta.inject.Inject; import java.util.Map; +import java.util.Set; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.client.api.ClientLogger; /** * This is based on org.jboss.resteasy.reactive.client.logging.DefaultClientLogger, - * with the only change being that the value of "Authorization" header, when present, - * is redacted. + * with the only change being that headers are redacted based on the Set provided + * by the configuration. */ @Dependent public class RedactingClientLogger implements ClientLogger { private static final Logger log = Logger.getLogger(RedactingClientLogger.class); + private static final String REDACTED_VALUE = "*****"; + + private final Set redactedHeaders; + private int bodySize; + @Inject + public RedactingClientLogger(RedactingClientLoggerConfiguration configuration) { + this.redactedHeaders = configuration + .headers() + .redact() + .orElse(RedactingClientLoggerConfiguration.Headers.DEFAULT_REDACTED_HEADERS); + } + @Override public void setBodySize(int bodySize) { this.bodySize = bodySize; @@ -97,7 +110,7 @@ public class RedactingClientLogger implements ClientLogger { } var key = entry.getKey(); - var value = HttpHeaders.AUTHORIZATION.equalsIgnoreCase(key) ? "*****" : entry.getValue(); + var value = redactedHeaders.contains(key.toLowerCase()) ? REDACTED_VALUE : entry.getValue(); sb.append(key).append('=').append(value); } 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 new file mode 100644 index 0000000..24fa05f --- /dev/null +++ b/quarkus-client-logger/src/main/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerConfiguration.java @@ -0,0 +1,20 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.smallrye.config.ConfigMapping; +import io.smallrye.config.WithConverter; +import jakarta.ws.rs.core.HttpHeaders; +import java.util.Optional; +import java.util.Set; + +@ConfigMapping(prefix = "phoenix.client-logger") +public interface RedactingClientLoggerConfiguration { + + Headers headers(); + + interface Headers { + + Set DEFAULT_REDACTED_HEADERS = Set.of(HttpHeaders.AUTHORIZATION.toLowerCase()); + + Optional> redact(); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelProfile.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelProfile.java new file mode 100644 index 0000000..35acb14 --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelProfile.java @@ -0,0 +1,12 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.quarkus.test.junit.QuarkusTestProfile; +import java.util.Map; + +public class InfoLevelProfile implements QuarkusTestProfile { + + @Override + public Map getConfigOverrides() { + return Map.of("quarkus.log.category.\"ch.phoenix.oss.quarkus.commons.client.logger\".level", "INFO"); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelTest.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelTest.java new file mode 100644 index 0000000..c6b27ef --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/InfoLevelTest.java @@ -0,0 +1,44 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; +import jakarta.inject.Inject; +import java.net.URI; +import java.util.Optional; +import org.eclipse.microprofile.rest.client.inject.RestClient; +import org.junit.jupiter.api.Test; + +@QuarkusTest +@TestProfile(InfoLevelProfile.class) +class InfoLevelTest { + + @Inject + @RestClient + TestClient injectedClient; + + TestClient builtClient = QuarkusRestClientBuilder.newBuilder() + .clientLogger(new RedactingClientLogger(() -> Optional::empty)) + .baseUri(URI.create("http://localhost:8087")) + .build(TestClient.class); + + @Test + void getWithInjectedClient() { + injectedClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted"); + } + + @Test + void getWithBuiltClientAndEmptyConfig() { + builtClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted"); + } + + @Test + void postWithInjectedClient() { + injectedClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted", "body"); + } + + @Test + void postWithBuiltClientAndEmptyConfig() { + builtClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted", ""); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerTest.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerTest.java new file mode 100644 index 0000000..01e9389 --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/RedactingClientLoggerTest.java @@ -0,0 +1,47 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; +import io.quarkus.test.junit.QuarkusTest; +import jakarta.inject.Inject; +import java.net.URI; +import java.util.Optional; +import org.eclipse.microprofile.rest.client.inject.RestClient; +import org.junit.jupiter.api.Test; + +@QuarkusTest +class RedactingClientLoggerTest { + + @Inject + @RestClient + TestClient injectedClient; + + TestClient builtClient = QuarkusRestClientBuilder.newBuilder() + .clientLogger(new RedactingClientLogger(() -> Optional::empty)) + .baseUri(URI.create("http://localhost:8087")) + .build(TestClient.class); + + @Test + void getWithInjectedClient() { + injectedClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted"); + } + + @Test + void getWithBuiltClientAndEmptyConfig() { + builtClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted"); + } + + @Test + void postWithInjectedClient() { + injectedClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted", "body"); + } + + @Test + void postWithInjectedClientAndNullBody() { + injectedClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted", null); + } + + @Test + void postWithBuiltClientAndEmptyConfig() { + builtClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted", ""); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneProfile.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneProfile.java new file mode 100644 index 0000000..42daa28 --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneProfile.java @@ -0,0 +1,12 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.quarkus.test.junit.QuarkusTestProfile; +import java.util.Map; + +public class ScopeNoneProfile implements QuarkusTestProfile { + + @Override + public Map getConfigOverrides() { + return Map.of("quarkus.rest-client.logging.scope", "none"); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneTest.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneTest.java new file mode 100644 index 0000000..14538b2 --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/ScopeNoneTest.java @@ -0,0 +1,44 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder; +import io.quarkus.test.junit.QuarkusTest; +import io.quarkus.test.junit.TestProfile; +import jakarta.inject.Inject; +import java.net.URI; +import java.util.Optional; +import org.eclipse.microprofile.rest.client.inject.RestClient; +import org.junit.jupiter.api.Test; + +@QuarkusTest +@TestProfile(ScopeNoneProfile.class) +class ScopeNoneTest { + + @Inject + @RestClient + TestClient injectedClient; + + TestClient builtClient = QuarkusRestClientBuilder.newBuilder() + .clientLogger(new RedactingClientLogger(() -> Optional::empty)) + .baseUri(URI.create("http://localhost:8087")) + .build(TestClient.class); + + @Test + void getWithInjectedClient() { + injectedClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted"); + } + + @Test + void getWithBuiltClientAndEmptyConfig() { + builtClient.get("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted"); + } + + @Test + void postWithInjectedClient() { + injectedClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "also redacted", "body"); + } + + @Test + void postWithBuiltClientAndEmptyConfig() { + builtClient.post("this will be redacted", "5c0d8e45-e402-4b71-8f84-24cc0cfd7eec", "not redacted", ""); + } +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestClient.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestClient.java new file mode 100644 index 0000000..79769ac --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestClient.java @@ -0,0 +1,28 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; +import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; + +@SuppressWarnings("UastIncorrectHttpHeaderInspection") +@RegisterRestClient(configKey = "test") +public interface TestClient { + + @GET + @Path("/") + @Produces(MediaType.TEXT_PLAIN) + String get( + @HeaderParam("Authorization") String authorization, + @HeaderParam("X-Request-ID") String requestId, + @HeaderParam("X-Something-Else") String somethingElse); + + @POST + @Path("/") + @Consumes(MediaType.TEXT_PLAIN) + @Produces(MediaType.TEXT_PLAIN) + String post( + @HeaderParam("Authorization") String authorization, + @HeaderParam("X-Request-ID") String requestId, + @HeaderParam("X-Something-Else") String somethingElse, + String body); +} diff --git a/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestResource.java b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestResource.java new file mode 100644 index 0000000..c83bdd0 --- /dev/null +++ b/quarkus-client-logger/src/test/java/ch/phoenix/oss/quarkus/commons/client/logger/TestResource.java @@ -0,0 +1,21 @@ +package ch.phoenix.oss.quarkus.commons.client.logger; + +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; + +@Path("/") +public class TestResource { + + @GET + @Produces(MediaType.TEXT_PLAIN) + public String get() { + return "get"; + } + + @POST + @Consumes(MediaType.TEXT_PLAIN) + @Produces(MediaType.TEXT_PLAIN) + public String post(String body) { + return body; + } +} diff --git a/quarkus-client-logger/src/test/resources/application.yaml b/quarkus-client-logger/src/test/resources/application.yaml new file mode 100644 index 0000000..a02f41d --- /dev/null +++ b/quarkus-client-logger/src/test/resources/application.yaml @@ -0,0 +1,20 @@ +quarkus: + http: + test-port: 8087 + rest-client: + logging: + scope: request-response + body-limit: 10000 + test: + url: http://localhost:${quarkus.http.test-port} + log: + category: + "ch.phoenix.oss.quarkus.commons.client.logger": + level: DEBUG + +phoenix: + client-logger: + headers: + redact: + - AUTHORIZATION + - X-SOMETHING-ELSE From 3ae16bfa253b8dd3e8a62fb40a4aaf110f8ac5c6 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 30 Jul 2025 14:49:00 +0200 Subject: [PATCH 28/35] chore: bump version to 1.0.7 --- .github/project.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yaml b/.github/project.yaml index b1c8594..4a177d6 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,5 +1,5 @@ name: Quarkus Commons release: - current-version: "1.0.6" - next-version: "1.0.7-SNAPSHOT" + current-version: "1.0.7" + next-version: "1.0.8-SNAPSHOT" From 6a3026de70563fff4606f0812a331114d80620d8 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Wed, 30 Jul 2025 12:52:52 +0000 Subject: [PATCH 29/35] chore: release 1.0.7 --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 8e88778..a6660de 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 pom @@ -73,7 +73,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 - HEAD + 1.0.7 diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 59c7367..1f274e3 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 9306ab4..9d593b2 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 59c15ae..d10a9f4 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 22775c3..0355ccc 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index b7e365d..8c72f61 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.7-SNAPSHOT + 1.0.7 quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 5e9f0e0..37ec4cb 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.7-SNAPSHOT + 1.0.7 quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 44dc2f9..d682448 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index a67e844..405a9f0 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7-SNAPSHOT + 1.0.7 quarkus-uuid-generator From 7a33e9cdbbdfc4e3401deebb0576cfe8ac883d94 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Wed, 30 Jul 2025 12:52:53 +0000 Subject: [PATCH 30/35] chore: prepare for next development iteration --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index a6660de..d46a115 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT pom @@ -73,7 +73,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.7 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 1f274e3..f4cabbd 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 9d593b2..144c0a7 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index d10a9f4..76982ef 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 0355ccc..9f61cd5 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 8c72f61..293f484 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.7 + 1.0.8-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 37ec4cb..f3ff525 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.7 + 1.0.8-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index d682448..9c8471a 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 405a9f0..986b323 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.7 + 1.0.8-SNAPSHOT quarkus-uuid-generator From 25ea6c556d6f9c52fa9d133e3c4a2d2686e1a2d3 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 30 Jul 2025 15:27:53 +0200 Subject: [PATCH 31/35] feat(deps): update quarkus.platform.version to 3.25.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d46a115..90dcbc6 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ quarkus-bom io.quarkus.platform - 3.24.4 + 3.25.0 3.14.0 From 9621f913e38fc42fa32f99470ad7fb6b573b24d7 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 30 Jul 2025 15:33:00 +0200 Subject: [PATCH 32/35] chore: bump version to 1.0.8 --- .github/project.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/project.yaml b/.github/project.yaml index 4a177d6..0b40189 100644 --- a/.github/project.yaml +++ b/.github/project.yaml @@ -1,5 +1,5 @@ name: Quarkus Commons release: - current-version: "1.0.7" - next-version: "1.0.8-SNAPSHOT" + current-version: "1.0.8" + next-version: "1.0.9-SNAPSHOT" From 584ffc85f2b4320d7c45c725c4501c2818066440 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Wed, 30 Jul 2025 13:34:45 +0000 Subject: [PATCH 33/35] chore: release 1.0.8 --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 90dcbc6..6976b67 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 pom @@ -73,7 +73,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 - HEAD + 1.0.8 diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index f4cabbd..5c905f4 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index 144c0a7..cdfe438 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index 76982ef..f8d077c 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index 9f61cd5..d404f1d 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 293f484..9533270 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.8-SNAPSHOT + 1.0.8 quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index f3ff525..5638017 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.8-SNAPSHOT + 1.0.8 quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 9c8471a..775d445 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 986b323..8f3de48 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8-SNAPSHOT + 1.0.8 quarkus-uuid-generator From 58a53fe280d1ff39cfa3a8b0c58577639f2e4ea0 Mon Sep 17 00:00:00 2001 From: maven_release_technical_account Date: Wed, 30 Jul 2025 13:34:47 +0000 Subject: [PATCH 34/35] chore: prepare for next development iteration --- pom.xml | 4 ++-- quarkus-audit-tools/pom.xml | 2 +- quarkus-client-logger/pom.xml | 2 +- quarkus-clock-service/pom.xml | 2 +- quarkus-json-service/pom.xml | 2 +- quarkus-message-digest-service/pom.xml | 2 +- quarkus-random-number-generator/pom.xml | 2 +- quarkus-tracing-service/pom.xml | 2 +- quarkus-uuid-generator/pom.xml | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 6976b67..3b61944 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT pom @@ -73,7 +73,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.8 + HEAD diff --git a/quarkus-audit-tools/pom.xml b/quarkus-audit-tools/pom.xml index 5c905f4..1a01d07 100644 --- a/quarkus-audit-tools/pom.xml +++ b/quarkus-audit-tools/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-audit-tools diff --git a/quarkus-client-logger/pom.xml b/quarkus-client-logger/pom.xml index cdfe438..3095369 100644 --- a/quarkus-client-logger/pom.xml +++ b/quarkus-client-logger/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-client-logger diff --git a/quarkus-clock-service/pom.xml b/quarkus-clock-service/pom.xml index f8d077c..aaab0c1 100644 --- a/quarkus-clock-service/pom.xml +++ b/quarkus-clock-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-clock-service diff --git a/quarkus-json-service/pom.xml b/quarkus-json-service/pom.xml index d404f1d..717c39f 100644 --- a/quarkus-json-service/pom.xml +++ b/quarkus-json-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-json-service diff --git a/quarkus-message-digest-service/pom.xml b/quarkus-message-digest-service/pom.xml index 9533270..c5d2c2d 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.8 + 1.0.9-SNAPSHOT quarkus-message-digest-service diff --git a/quarkus-random-number-generator/pom.xml b/quarkus-random-number-generator/pom.xml index 5638017..940f965 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.8 + 1.0.9-SNAPSHOT quarkus-random-number-generator diff --git a/quarkus-tracing-service/pom.xml b/quarkus-tracing-service/pom.xml index 775d445..214e936 100644 --- a/quarkus-tracing-service/pom.xml +++ b/quarkus-tracing-service/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-tracing-service diff --git a/quarkus-uuid-generator/pom.xml b/quarkus-uuid-generator/pom.xml index 8f3de48..a6c395c 100644 --- a/quarkus-uuid-generator/pom.xml +++ b/quarkus-uuid-generator/pom.xml @@ -5,7 +5,7 @@ ch.phoenix.oss quarkus-commons - 1.0.8 + 1.0.9-SNAPSHOT quarkus-uuid-generator From 1e9ab13c9787375c4ce0d0d9c77123b6a8df7c17 Mon Sep 17 00:00:00 2001 From: Jorge Bornhausen Date: Wed, 30 Jul 2025 15:34:35 +0200 Subject: [PATCH 35/35] ci(github-actions): simplify maven settings --- .github/workflows/build.yaml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index bf8a636..1272b20 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -63,14 +63,8 @@ jobs: servers: | [{ "id": "phoenix-oss", - "configuration": { - "httpHeaders": { - "property": { - "name": "Authorization", - "value": "token ${{ secrets.ORG_PACKAGE_WRITER_TOKEN }}" - } - } - } + "username": "${{ vars.ORG_PACKAGE_WRITER_USERNAME }}", + "password": "${{ secrets.ORG_PACKAGE_WRITER_TOKEN }}" }] - name: Make maven wrapper executable