From e7abfbcfed9b4585c996d7deef724bc10dc7fd41 Mon Sep 17 00:00:00 2001 From: THOREL Arnaud Date: Wed, 25 Mar 2026 11:23:23 +0100 Subject: [PATCH 1/4] fix: replace HashMap with ConcurrentHashMap to fix ConcurrentModificationException --- .../service/validators/FilterFieldValidatorService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java b/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java index 45a2942..6e4f5f0 100644 --- a/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java +++ b/src/main/java/fr/ouestfrance/querydsl/service/validators/FilterFieldValidatorService.java @@ -4,9 +4,9 @@ import fr.ouestfrance.querydsl.model.SimpleFilter; import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; import java.util.Map; import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; /** * FilterFieldValidator service allow to check the validity of annotated clazz @@ -37,7 +37,7 @@ public class FilterFieldValidatorService { /** * Map of validators */ - private static final Map, FilterFieldValidator> VALIDATOR_MAP = new HashMap<>(); + private static final Map, FilterFieldValidator> VALIDATOR_MAP = new ConcurrentHashMap<>(); /** * Check each filter and build a filter of violations From f4aae830240e5a6bc61f207ebb5b9b7a3ce5df4c Mon Sep 17 00:00:00 2001 From: THOREL Arnaud Date: Wed, 25 Mar 2026 12:51:11 +0100 Subject: [PATCH 2/4] fix: migrate to Maven Central Portal (central-publishing-maven-plugin) --- .github/workflows/release.yml | 6 ++++-- pom.xml | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d1836e..42237cd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,10 +23,12 @@ jobs: server-id: ossrh server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD + - name: Prepare Settings + uses: whelk-io/maven-settings-xml-action@v22 + with: + servers: '[{ "id": "central", "username": "${{ secrets.OSSRH_USERNAME }}", "password": "${{ secrets.OSSRH_TOKEN }}" }]' - name: Release env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config --global user.name 'github-actions' diff --git a/pom.xml b/pom.xml index c885f44..d41f55d 100644 --- a/pom.xml +++ b/pom.xml @@ -36,17 +36,6 @@ HEAD - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - org.junit.jupiter @@ -124,7 +113,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.5 + 3.2.8 sign-artifacts @@ -150,6 +139,17 @@ -Dmaven.test.skipTests=true -Dmaven.test.skip=true + + org.sonatype.central + central-publishing-maven-plugin + 0.9.0 + true + + central + true + published + + org.sonarsource.scanner.maven sonar-maven-plugin From d7552b06a1e14ec85df3dd69d843adac4bcafbf0 Mon Sep 17 00:00:00 2001 From: THOREL Arnaud Date: Wed, 25 Mar 2026 12:53:21 +0100 Subject: [PATCH 3/4] fix: upgrade sonar-maven-plugin to 5.3.0.6276 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d41f55d..4768e17 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.9.1.2184 + 5.3.0.6276 From 1f76be489e7f5422ca943af8cbd82ec7668068c1 Mon Sep 17 00:00:00 2001 From: THOREL Arnaud Date: Wed, 25 Mar 2026 12:59:43 +0100 Subject: [PATCH 4/4] fix: remove sonar.branch.name and migrate snapshot deploy to Central Portal --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05e8dc8..4fc1e2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,9 +31,10 @@ jobs: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_PROJECT: Ouest-France_${{ github.event.repository.name }} - run: mvn -ntp -B sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} -Dsonar.projectKey=$SONAR_PROJECT -Dsonar.branch.name=${GITHUB_REF##*/} + run: mvn -ntp -B sonar:sonar -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=${{ vars.SONAR_ORGANIZATION }} -Dsonar.projectKey=$SONAR_PROJECT + - name: Prepare Settings + uses: whelk-io/maven-settings-xml-action@v22 + with: + servers: '[{ "id": "central", "username": "${{ secrets.OSSRH_USERNAME }}", "password": "${{ secrets.OSSRH_TOKEN }}" }]' - name: Deploy Snapshot - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} run: mvn -ntp -B deploy -DskipTests=true