Compare commits

..

No commits in common. "main" and "1.0.13" have entirely different histories.
main ... 1.0.13

19 changed files with 47 additions and 46 deletions

View file

@ -1,5 +1,5 @@
name: Quarkus Commons
release:
current-version: "1.1.2"
next-version: "1.1.3-SNAPSHOT"
current-version: "1.0.13"
next-version: "1.0.14-SNAPSHOT"

View file

@ -25,12 +25,12 @@ jobs:
steps:
- name: Checkout the code
uses: https://github.com/actions/checkout@v5
uses: actions/checkout@v4
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 21
uses: https://github.com/actions/setup-java@v5
uses: https://github.com/actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
@ -48,7 +48,7 @@ jobs:
- name: Cache Maven Repository
id: cache-maven
uses: https://github.com/actions/cache@v4
uses: actions/cache@v4
with:
path: ~/.m2/repository
# The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
@ -58,7 +58,7 @@ jobs:
${{ steps.cache-key.outputs.m2-monthly-cache-key }}
- name: Configure Maven CI/CD settings
uses: https://github.com/s4u/maven-settings-action@v4.0.0
uses: https://github.com/s4u/maven-settings-action@v3.1.0
with:
servers: |
[{

View file

@ -17,7 +17,7 @@ jobs:
steps:
- name: Checkout the code
uses: https://github.com/actions/checkout@v5
uses: actions/checkout@v4
- name: Retrieve project metadata
uses: https://github.com/radcortez/project-metadata-action@main
@ -60,7 +60,7 @@ jobs:
git config --global user.signingkey ${SSH_DIR}/id_rsa
- name: Set up JDK 21
uses: https://github.com/actions/setup-java@v5
uses: https://github.com/actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
@ -78,7 +78,7 @@ jobs:
- name: Cache Maven Repository
id: cache-maven
uses: https://github.com/actions/cache@v4
uses: actions/cache@v4
with:
path: ~/.m2/repository
# The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.

View file

@ -11,7 +11,7 @@ jobs:
steps:
- name: Checkout the code
uses: https://github.com/actions/checkout@v5
uses: https://github.com/actions/checkout@v4
- name: Retrieve project metadata
uses: https://github.com/radcortez/project-metadata-action@main

20
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
<packaging>pom</packaging>
<modules>
@ -22,15 +22,15 @@
<!-- Quarkus properties -->
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
<quarkus.platform.version>3.28.4</quarkus.platform.version>
<quarkus.platform.version>3.26.2</quarkus.platform.version>
<!-- Plugin versions -->
<compiler-plugin.version>3.14.1</compiler-plugin.version>
<surefire-plugin.version>3.5.4</surefire-plugin.version>
<spotless-plugin.version>3.0.0</spotless-plugin.version>
<compiler-plugin.version>3.14.0</compiler-plugin.version>
<surefire-plugin.version>3.5.3</surefire-plugin.version>
<spotless-plugin.version>2.46.1</spotless-plugin.version>
<palantir-java-format.version>2.72.0</palantir-java-format.version>
<jacoco-plugin.version>0.8.14</jacoco-plugin.version> <!-- Match with version from Quarkus BOM -->
<jandex-plugin.version>3.5.0</jandex-plugin.version>
<jacoco-plugin.version>0.8.13</jacoco-plugin.version> <!-- Match with version from Quarkus BOM -->
<jandex-plugin.version>3.4.0</jandex-plugin.version>
<release-plugin.version>3.1.1</release-plugin.version>
<source-plugin.version>3.3.1</source-plugin.version>
@ -41,10 +41,10 @@
<skipITs>true</skipITs>
<!-- Dependencies -->
<java-uuid-generator.version>5.1.1</java-uuid-generator.version>
<java-uuid-generator.version>5.1.0</java-uuid-generator.version>
<!-- Test dependencies -->
<assertj-core.version>3.27.6</assertj-core.version>
<assertj-core.version>3.27.4</assertj-core.version>
</properties>
<distributionManagement>
@ -74,7 +74,7 @@
<connection>scm:git:ssh://git@git-ssh.kvant.cloud:2222/phoenix-oss/quarkus-commons.git</connection>
<developerConnection>scm:git:ssh://git@git-ssh.kvant.cloud:2222/phoenix-oss/quarkus-commons.git</developerConnection>
<url>https://git.kvant.cloud/phoenix-oss/quarkus-commons.git</url>
<tag>HEAD</tag>
<tag>1.0.13</tag>
</scm>
<dependencies>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-audit-tools</artifactId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-client-logger</artifactId>

View file

@ -6,7 +6,7 @@ import jakarta.ws.rs.core.HttpHeaders;
import java.util.Optional;
import java.util.Set;
@ConfigMapping(prefix = "phoenix-oss.client-logger")
@ConfigMapping(prefix = "phoenix.client-logger")
public interface RedactingClientLoggerConfiguration {
Headers headers();

View file

@ -12,7 +12,7 @@ quarkus:
"ch.phoenix.oss.quarkus.commons.client.logger":
level: DEBUG
phoenix-oss:
phoenix:
client-logger:
headers:
redact:

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-clock-service</artifactId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-json-service</artifactId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-message-digest-service</artifactId>

View file

@ -3,7 +3,7 @@ package ch.phoenix.oss.quarkus.commons.digest;
import io.smallrye.config.ConfigMapping;
import io.smallrye.config.WithDefault;
@ConfigMapping(prefix = "phoenix-oss.message-digest")
@ConfigMapping(prefix = "phoenix.message-digest")
public interface MessageDigestConfiguration {
@WithDefault("SHA-256")

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-random-number-generator</artifactId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-table-generator</artifactId>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-tracing-service</artifactId>

View file

@ -7,7 +7,7 @@ import jakarta.ws.rs.core.HttpHeaders;
import java.util.Optional;
import java.util.Set;
@ConfigMapping(prefix = "phoenix-oss.tracing")
@ConfigMapping(prefix = "phoenix.commons.tracing")
public interface TracingConfiguration {
RequestFilterConfiguration requestFilter();

View file

@ -23,16 +23,17 @@ quarkus:
category:
"ch.phoenix.oss.quarkus.commons.tracing":
level: TRACE
phoenix-oss:
tracing:
request-filter:
path:
include-raw: true
headers:
redact:
- AUTHORIZATION
- X-SOMETHING-ELSE
query:
include-raw: true
redact:
- ACCESS_TOKEN
phoenix:
commons:
tracing:
request-filter:
path:
include-raw: true
headers:
redact:
- AUTHORIZATION
- X-SOMETHING-ELSE
query:
include-raw: true
redact:
- ACCESS_TOKEN

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.1.3-SNAPSHOT</version>
<version>1.0.13</version>
</parent>
<artifactId>quarkus-uuid-generator</artifactId>