Compare commits

..

59 commits
1.0.11 ... main

Author SHA1 Message Date
4cf733f2e0 fix(deps): update quarkus packages to 3.28.4 (renovate)
All checks were successful
Build / build (pull_request) Successful in 2m47s
Build / build (push) Successful in 3m55s
2025-10-16 21:21:57 +00:00
69c09b38c8
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m33s
2025-10-15 09:10:48 +00:00
01bd8f0e5e
chore: release 1.1.2
All checks were successful
Build / build (push) Successful in 2m39s
2025-10-15 09:10:47 +00:00
015ffc41a9 Merge pull request 'chore: bump version to 1.1.3' (#140) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 1m33s
Reviewed-on: #140
2025-10-15 09:09:16 +00:00
811cc349ef
chore: bump version to 1.1.3
All checks were successful
Validate release versions / release (pull_request) Successful in 5s
Build / build (pull_request) Successful in 1m55s
2025-10-15 11:03:40 +02:00
2f488e0670 fix(deps): update org.jacoco:jacoco-maven-plugin to 0.8.14 (renovate)
All checks were successful
Build / build (pull_request) Successful in 2m7s
Build / build (push) Successful in 2m50s
2025-10-11 21:12:54 +00:00
5ff50a9635 ci: Updated github actions to use full urls
All checks were successful
Build / build (pull_request) Successful in 1m48s
Build / build (push) Successful in 2m32s
2025-10-10 08:52:47 +00:00
1f2cc4b05a ci(github-action)!: Update actions/checkout action to v5 (renovate) 2025-10-10 08:52:47 +00:00
68455c65a8 ci(github-action)!: Update https://github.com/actions/setup-java action to v5 (renovate)
All checks were successful
Build / build (pull_request) Successful in 1m47s
Build / build (push) Successful in 6m57s
2025-10-10 08:34:42 +00:00
ffcc764133 ci(github-action)!: Update https://github.com/actions/checkout action to v5 (renovate)
All checks were successful
Build / build (pull_request) Successful in 1m57s
Build / build (push) Successful in 2m48s
2025-10-10 08:19:18 +00:00
6fa9b23a99 ci(github-action)!: Update https://github.com/s4u/maven-settings-action action to v4.0.0 (renovate)
All checks were successful
Build / build (pull_request) Successful in 2m8s
Build / build (push) Successful in 4m28s
2025-10-10 08:09:51 +00:00
babb8145b9 fix(deps): update quarkus.platform.version to 3.28.3 (renovate)
All checks were successful
Build / build (pull_request) Successful in 2m54s
Build / build (push) Successful in 3m23s
2025-10-09 21:34:07 +00:00
ff9716514e
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m54s
2025-10-06 09:55:38 +00:00
2daa09cfde
chore: release 1.1.1
All checks were successful
Build / build (push) Successful in 2m20s
2025-10-06 09:55:37 +00:00
52e73ce137 Merge pull request 'chore: bump version to 1.1.1' (#133) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 2m28s
Reviewed-on: #133
2025-10-06 09:53:24 +00:00
bb82c8d043
chore: bump version to 1.1.1
All checks were successful
Validate release versions / release (pull_request) Successful in 4s
Build / build (pull_request) Successful in 2m27s
2025-10-06 11:50:11 +02:00
15e8b6129d Merge pull request 'fix(deps): update com.fasterxml.uuid:java-uuid-generator to 5.1.1' (#132) from renovate/java-uuid-generator.version into main
All checks were successful
Build / build (push) Successful in 3m9s
Reviewed-on: #132
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-10-06 09:49:23 +00:00
7cf442b65f fix(deps): update com.fasterxml.uuid:java-uuid-generator to 5.1.1 2025-10-06 09:49:23 +00:00
7b3f0c4389 Merge pull request 'fix(deps): update org.apache.maven.plugins:maven-compiler-plugin to 3.14.1' (#129) from renovate/compiler-plugin.version into main
Some checks failed
Build / build (push) Has been cancelled
Reviewed-on: #129
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-10-06 09:49:04 +00:00
36e99650e1 fix(deps): update org.apache.maven.plugins:maven-compiler-plugin to 3.14.1 2025-10-06 09:49:04 +00:00
3b34ef1c67 Merge pull request 'feat(deps)!: Update com.diffplug.spotless:spotless-maven-plugin to 3.0.0' (#131) from renovate/major-spotless-plugin.version into main
Some checks failed
Build / build (push) Has been cancelled
Reviewed-on: #131
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-10-06 09:48:48 +00:00
c158d595a9 feat(deps)!: Update com.diffplug.spotless:spotless-maven-plugin to 3.0.0 2025-10-06 09:48:48 +00:00
552132ec05 Merge pull request 'feat(deps): update quarkus.platform.version to 3.28.2' (#130) from renovate/quarkus.platform.version into main
Some checks failed
Build / build (push) Has been cancelled
Reviewed-on: #130
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-10-06 09:48:35 +00:00
2efb1ec4f8 feat(deps): update quarkus.platform.version to 3.28.2
All checks were successful
Build / build (pull_request) Successful in 2m31s
2025-10-01 19:09:07 +00:00
bb5c3348ea Merge pull request 'fix(deps): update org.assertj:assertj-core to 3.27.6' (#128) from renovate/assertj-core.version into main
All checks were successful
Build / build (push) Successful in 3m6s
Reviewed-on: #128
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-09-23 19:42:48 +00:00
3f6bae2b49 fix(deps): update org.assertj:assertj-core to 3.27.6
All checks were successful
Build / build (pull_request) Successful in 2m29s
2025-09-22 19:09:58 +00:00
9bc298643a Merge pull request 'fix(deps): update quarkus.platform.version to 3.26.4' (#127) from renovate/quarkus.platform.version into main
All checks were successful
Build / build (push) Successful in 2m43s
Reviewed-on: #127
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-09-18 07:25:26 +00:00
b98d342f5b fix(deps): update quarkus.platform.version to 3.26.4
All checks were successful
Build / build (pull_request) Successful in 1m53s
2025-09-17 17:11:11 +00:00
4334faf044
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m55s
2025-09-16 20:16:40 +00:00
efe5cf1e22
chore: release 1.1.0
All checks were successful
Build / build (push) Successful in 2m56s
2025-09-16 20:16:33 +00:00
d2d2b225cb Merge pull request 'chore: bump version to 1.1.0' (#126) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 1m46s
Reviewed-on: #126
2025-09-16 20:14:52 +00:00
b6a3bdd9fa
chore: bump version to 1.1.0
All checks were successful
Validate release versions / release (pull_request) Successful in 3s
Build / build (pull_request) Successful in 1m39s
2025-09-16 22:12:30 +02:00
b80e078903 Merge pull request 'refactor: standardize @ConfigMapping prefixes' (#125) from rename-configs into main
All checks were successful
Build / build (push) Successful in 2m26s
Reviewed-on: #125
2025-09-16 20:11:51 +00:00
d449192dae
refactor: standardize @ConfigMapping prefixes
All checks were successful
Build / build (pull_request) Successful in 2m28s
2025-09-16 22:08:44 +02:00
f2d02491ee Merge pull request 'feat(deps): update io.smallrye:jandex-maven-plugin to 3.5.0' (#123) from renovate/jandex-plugin.version into main
All checks were successful
Build / build (push) Successful in 2m50s
Reviewed-on: #123
2025-09-13 14:11:49 +00:00
e4a357b745 feat(deps): update io.smallrye:jandex-maven-plugin to 3.5.0 2025-09-13 14:11:49 +00:00
d2e57e413b Merge pull request 'fix(deps): update org.apache.maven.plugins:maven-surefire-plugin to 3.5.4' (#124) from renovate/surefire-plugin.version into main
Some checks failed
Build / build (push) Has been cancelled
Reviewed-on: #124
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-09-13 14:11:24 +00:00
debea7a86c fix(deps): update org.apache.maven.plugins:maven-surefire-plugin to 3.5.4
All checks were successful
Build / build (pull_request) Successful in 1m43s
2025-09-13 03:15:24 +00:00
e0ebbe8c02
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m56s
2025-09-12 11:08:07 +00:00
80af944f35
chore: release 1.0.14
All checks were successful
Build / build (push) Successful in 3m2s
2025-09-12 11:08:03 +00:00
715d6b173e Merge pull request 'chore: bump version to 1.0.14' (#122) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 1m56s
Reviewed-on: #122
2025-09-12 11:06:12 +00:00
105ab75b3a
chore: bump version to 1.0.14
All checks were successful
Validate release versions / release (pull_request) Successful in 6s
Build / build (pull_request) Successful in 2m17s
2025-09-12 13:03:06 +02:00
31e09c76b2 Merge pull request 'fix(deps): update quarkus.platform.version to 3.26.3' (#121) from renovate/quarkus.platform.version into main
All checks were successful
Build / build (push) Successful in 3m48s
Reviewed-on: #121
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-09-12 11:01:25 +00:00
8dfa709ca8 fix(deps): update quarkus.platform.version to 3.26.3
All checks were successful
Build / build (pull_request) Successful in 2m6s
2025-09-10 07:07:27 +00:00
7562823671
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 3m4s
2025-09-04 13:32:52 +00:00
8562c61910
chore: release 1.0.13
All checks were successful
Build / build (push) Successful in 3m0s
2025-09-04 13:32:50 +00:00
05d59f136a Merge pull request 'chore: bump version to 1.0.13' (#120) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 2m5s
Reviewed-on: #120
2025-09-04 13:31:00 +00:00
8c606c4c3c
chore: bump version to 1.0.13
All checks were successful
Validate release versions / release (pull_request) Successful in 8s
Build / build (pull_request) Successful in 2m9s
2025-09-04 15:28:19 +02:00
66eb4b91ec Merge pull request 'fix(deps): update quarkus.platform.version to 3.26.2' (#119) from renovate/quarkus.platform.version into main
All checks were successful
Build / build (push) Successful in 2m45s
Reviewed-on: #119
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-09-04 13:16:43 +00:00
ec02ad9bc3 fix(deps): update quarkus.platform.version to 3.26.2
All checks were successful
Build / build (pull_request) Successful in 1m58s
2025-09-03 17:15:18 +00:00
4d18ae0fd8 Merge pull request 'fix(deps): update maven-wrapper to 3.3.3' (#117) from renovate/maven-wrapper-3.x into main
All checks were successful
Build / build (push) Successful in 2m15s
Reviewed-on: #117
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-08-30 18:09:38 +00:00
22f5cd98f2 fix(deps): update maven-wrapper to 3.3.3
All checks were successful
Build / build (pull_request) Successful in 2m12s
2025-08-30 13:02:59 +00:00
32c173f7a6
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m40s
2025-08-29 19:24:53 +00:00
3e9a386578
chore: release 1.0.12
All checks were successful
Build / build (push) Successful in 2m28s
2025-08-29 19:24:52 +00:00
592005798f Merge pull request 'chore: bump version to 1.0.12' (#116) from version into main
All checks were successful
Release the current version / Execute the release (push) Successful in 1m31s
Reviewed-on: #116
2025-08-29 19:23:24 +00:00
5a3607d866
chore: bump version to 1.0.12
All checks were successful
Validate release versions / release (pull_request) Successful in 4s
Build / build (pull_request) Successful in 1m54s
2025-08-29 21:21:21 +02:00
3ae3142dbf Merge pull request 'fix(deps): update quarkus.platform.version to 3.26.1' (#115) from renovate/quarkus.platform.version into main
All checks were successful
Build / build (push) Successful in 2m40s
Reviewed-on: #115
Reviewed-by: Jorge Bornhausen <jorge.bornhausen@phoenix-technologies.ch>
2025-08-29 19:01:02 +00:00
97b0086002 fix(deps): update quarkus.platform.version to 3.26.1
All checks were successful
Build / build (pull_request) Successful in 2m14s
2025-08-29 15:09:43 +00:00
1715fdec6a
chore: prepare for next development iteration
All checks were successful
Build / build (push) Successful in 2m59s
2025-08-28 18:57:55 +00:00
22 changed files with 278 additions and 220 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -1,19 +1,2 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
wrapperVersion=3.3.2
distributionType=only-script
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

50
mvnw vendored
View file

@ -19,7 +19,7 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
# Apache Maven Wrapper startup batch script, version 3.3.2
# Apache Maven Wrapper startup batch script, version 3.3.3
#
# Optional ENV vars
# -----------------
@ -105,14 +105,17 @@ trim() {
printf "%s" "${1}" | tr -d '[:space:]'
}
scriptDir="$(dirname "$0")"
scriptName="$(basename "$0")"
# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
while IFS="=" read -r key value; do
case "${key-}" in
distributionUrl) distributionUrl=$(trim "${value-}") ;;
distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
esac
done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
case "${distributionUrl##*/}" in
maven-mvnd-*bin.*)
@ -130,7 +133,7 @@ maven-mvnd-*bin.*)
distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
;;
maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
esac
# apply MVNW_REPOURL and calculate MAVEN_HOME
@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then
echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
exit 1
elif command -v sha256sum >/dev/null; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
distributionSha256Result=true
fi
elif command -v shasum >/dev/null; then
@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then
else
tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
fi
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
# Find the actual extracted directory name (handles snapshots where filename != directory name)
actualDistributionDir=""
# First try the expected directory name (for regular distributions)
if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
actualDistributionDir="$distributionUrlNameMain"
fi
fi
# If not found, search for any directory with the Maven executable (for snapshots)
if [ -z "$actualDistributionDir" ]; then
# enable globbing to iterate over items
set +f
for dir in "$TMP_DOWNLOAD_DIR"/*; do
if [ -d "$dir" ]; then
if [ -f "$dir/bin/$MVN_CMD" ]; then
actualDistributionDir="$(basename "$dir")"
break
fi
fi
done
set -f
fi
if [ -z "$actualDistributionDir" ]; then
verbose "Contents of $TMP_DOWNLOAD_DIR:"
verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
die "Could not find Maven distribution directory in extracted archive"
fi
verbose "Found extracted Maven distribution directory: $actualDistributionDir"
printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
clean || :
exec_maven "$@"

338
mvnw.cmd vendored
View file

@ -1,149 +1,189 @@
<# : batch portion
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.2
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
@REM ----------------------------------------------------------------------------
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
@SET __MVNW_CMD__=
@SET __MVNW_ERROR__=
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
@SET PSModulePath=
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
)
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
@SET __MVNW_PSMODULEP_SAVE=
@SET __MVNW_ARG0_NAME__=
@SET MVNW_USERNAME=
@SET MVNW_PASSWORD=
@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
@echo Cannot start maven from wrapper >&2 && exit /b 1
@GOTO :EOF
: end batch / begin powershell #>
$ErrorActionPreference = "Stop"
if ($env:MVNW_VERBOSE -eq "true") {
$VerbosePreference = "Continue"
}
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
if (!$distributionUrl) {
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
}
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
"maven-mvnd-*" {
$USE_MVND = $true
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
$MVN_CMD = "mvnd.cmd"
break
}
default {
$USE_MVND = $false
$MVN_CMD = $script -replace '^mvnw','mvn'
break
}
}
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
if ($env:MVNW_REPOURL) {
$MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
}
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
if ($env:MAVEN_USER_HOME) {
$MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
}
$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
exit $?
}
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
}
# prepare tmp dir
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
trap {
if ($TMP_DOWNLOAD_DIR.Exists) {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
}
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
# Download and Install Apache Maven
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
Write-Verbose "Downloading from: $distributionUrl"
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
$webclient = New-Object System.Net.WebClient
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
}
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
# If specified, validate the SHA-256 sum of the Maven distribution zip file
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
if ($distributionSha256Sum) {
if ($USE_MVND) {
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
}
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
}
}
# unzip and move
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
try {
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
} catch {
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
Write-Error "fail to move MAVEN_HOME"
}
} finally {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
<# : batch portion
@REM ----------------------------------------------------------------------------
@REM Licensed to the Apache Software Foundation (ASF) under one
@REM or more contributor license agreements. See the NOTICE file
@REM distributed with this work for additional information
@REM regarding copyright ownership. The ASF licenses this file
@REM to you under the Apache License, Version 2.0 (the
@REM "License"); you may not use this file except in compliance
@REM with the License. You may obtain a copy of the License at
@REM
@REM http://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@REM KIND, either express or implied. See the License for the
@REM specific language governing permissions and limitations
@REM under the License.
@REM ----------------------------------------------------------------------------
@REM ----------------------------------------------------------------------------
@REM Apache Maven Wrapper startup batch script, version 3.3.3
@REM
@REM Optional ENV vars
@REM MVNW_REPOURL - repo url base for downloading maven distribution
@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
@REM ----------------------------------------------------------------------------
@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
@SET __MVNW_CMD__=
@SET __MVNW_ERROR__=
@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
@SET PSModulePath=
@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
)
@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
@SET __MVNW_PSMODULEP_SAVE=
@SET __MVNW_ARG0_NAME__=
@SET MVNW_USERNAME=
@SET MVNW_PASSWORD=
@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
@echo Cannot start maven from wrapper >&2 && exit /b 1
@GOTO :EOF
: end batch / begin powershell #>
$ErrorActionPreference = "Stop"
if ($env:MVNW_VERBOSE -eq "true") {
$VerbosePreference = "Continue"
}
# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
if (!$distributionUrl) {
Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
}
switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
"maven-mvnd-*" {
$USE_MVND = $true
$distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
$MVN_CMD = "mvnd.cmd"
break
}
default {
$USE_MVND = $false
$MVN_CMD = $script -replace '^mvnw','mvn'
break
}
}
# apply MVNW_REPOURL and calculate MAVEN_HOME
# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
if ($env:MVNW_REPOURL) {
$MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
$distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
}
$distributionUrlName = $distributionUrl -replace '^.*/',''
$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
$MAVEN_M2_PATH = "$HOME/.m2"
if ($env:MAVEN_USER_HOME) {
$MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
}
if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
}
$MAVEN_WRAPPER_DISTS = $null
if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
$MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
} else {
$MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
}
$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
exit $?
}
if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
}
# prepare tmp dir
$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
trap {
if ($TMP_DOWNLOAD_DIR.Exists) {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
}
New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
# Download and Install Apache Maven
Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
Write-Verbose "Downloading from: $distributionUrl"
Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
$webclient = New-Object System.Net.WebClient
if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
$webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
}
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
# If specified, validate the SHA-256 sum of the Maven distribution zip file
$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
if ($distributionSha256Sum) {
if ($USE_MVND) {
Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
}
Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
}
}
# unzip and move
Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
# Find the actual extracted directory name (handles snapshots where filename != directory name)
$actualDistributionDir = ""
# First try the expected directory name (for regular distributions)
$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
$actualDistributionDir = $distributionUrlNameMain
}
# If not found, search for any directory with the Maven executable (for snapshots)
if (!$actualDistributionDir) {
Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
$testPath = Join-Path $_.FullName "bin/$MVN_CMD"
if (Test-Path -Path $testPath -PathType Leaf) {
$actualDistributionDir = $_.Name
}
}
}
if (!$actualDistributionDir) {
Write-Error "Could not find Maven distribution directory in extracted archive"
}
Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
try {
Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
} catch {
if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
Write-Error "fail to move MAVEN_HOME"
}
} finally {
try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
}
Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"

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.0.11</version>
<version>1.1.3-SNAPSHOT</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.26.0</quarkus.platform.version>
<quarkus.platform.version>3.28.4</quarkus.platform.version>
<!-- Plugin versions -->
<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>
<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>
<palantir-java-format.version>2.72.0</palantir-java-format.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>
<jacoco-plugin.version>0.8.14</jacoco-plugin.version> <!-- Match with version from Quarkus BOM -->
<jandex-plugin.version>3.5.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.0</java-uuid-generator.version>
<java-uuid-generator.version>5.1.1</java-uuid-generator.version>
<!-- Test dependencies -->
<assertj-core.version>3.27.4</assertj-core.version>
<assertj-core.version>3.27.6</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>1.0.11</tag>
<tag>HEAD</tag>
</scm>
<dependencies>

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.0.11</version>
<version>1.1.3-SNAPSHOT</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.0.11</version>
<version>1.1.3-SNAPSHOT</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.client-logger")
@ConfigMapping(prefix = "phoenix-oss.client-logger")
public interface RedactingClientLoggerConfiguration {
Headers headers();

View file

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

View file

@ -5,7 +5,7 @@
<parent>
<groupId>ch.phoenix.oss</groupId>
<artifactId>quarkus-commons</artifactId>
<version>1.0.11</version>
<version>1.1.3-SNAPSHOT</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.0.11</version>
<version>1.1.3-SNAPSHOT</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.0.11</version>
<version>1.1.3-SNAPSHOT</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.message-digest")
@ConfigMapping(prefix = "phoenix-oss.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.0.11</version>
<version>1.1.3-SNAPSHOT</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.0.11</version>
<version>1.1.3-SNAPSHOT</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.0.11</version>
<version>1.1.3-SNAPSHOT</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.commons.tracing")
@ConfigMapping(prefix = "phoenix-oss.tracing")
public interface TracingConfiguration {
RequestFilterConfiguration requestFilter();

View file

@ -23,17 +23,16 @@ quarkus:
category:
"ch.phoenix.oss.quarkus.commons.tracing":
level: TRACE
phoenix:
commons:
tracing:
request-filter:
path:
include-raw: true
headers:
redact:
- AUTHORIZATION
- X-SOMETHING-ELSE
query:
include-raw: true
redact:
- ACCESS_TOKEN
phoenix-oss:
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.0.11</version>
<version>1.1.3-SNAPSHOT</version>
</parent>
<artifactId>quarkus-uuid-generator</artifactId>