From 10141ed6c4f29ef55b2311274853f2d1673bbcd6 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 29 Jan 2026 04:42:46 +0000 Subject: [PATCH 01/58] Update com.vaadin to v25.0.4 --- demo/pom.xml | 2 +- vaadin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/pom.xml b/demo/pom.xml index 8e0d74b9..778e7dc9 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ UTF-8 - 25.0.3 + 25.0.4 4.0.2 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 2a5bfe43..e5feaabb 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -62,7 +62,7 @@ com.vaadin vaadin-bom - 25.0.3 + 25.0.4 pom import From 3242b45fab9b999deaeb2c65800f573ff50765ca Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 29 Jan 2026 04:43:01 +0000 Subject: [PATCH 02/58] Update dependency software.xdev:testcontainers-advanced-imagebuilder to v2.4.1 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 9d80e7c6..ff58da03 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -86,7 +86,7 @@ software.xdev testcontainers-advanced-imagebuilder - 2.4.0 + 2.4.1 org.testcontainers From 513a4afcccfd7189005bdd24fa545d968a0202a3 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 29 Jan 2026 04:43:03 +0000 Subject: [PATCH 03/58] Update dependency software.xdev:testcontainers-selenium to v1.5.2 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 9d80e7c6..cbb4ffcc 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -81,7 +81,7 @@ software.xdev testcontainers-selenium - 1.5.1 + 1.5.2 software.xdev From 1dbbd2dd7f61fe550ea3a6471edc097fc87859e5 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 29 Jan 2026 04:43:05 +0000 Subject: [PATCH 04/58] Update dependency software.xdev.tci:bom to v3.0.3 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 9d80e7c6..0782c757 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -99,7 +99,7 @@ software.xdev.tci bom - 3.0.0 + 3.0.3 pom import From 0f3f209b5e215cb05c5d2aa1e6dd7eee9213a42a Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 1 Feb 2026 04:56:12 +0000 Subject: [PATCH 05/58] Update dependency com.puppycrawl.tools:checkstyle to v13.1.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 84ce434e..d0627743 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.1.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 3738a65c..d8992d5a 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -215,7 +215,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.1.0 From b782259974ebd85ab887251d59fb85d354db3ec3 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 2 Feb 2026 04:53:19 +0000 Subject: [PATCH 06/58] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.15.0 --- template-placeholder-demo/pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/template-placeholder-demo/pom.xml b/template-placeholder-demo/pom.xml index 05b947bc..06fc3187 100644 --- a/template-placeholder-demo/pom.xml +++ b/template-placeholder-demo/pom.xml @@ -44,7 +44,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 3738a65c..0bc07842 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -97,7 +97,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} From cdbd713ed0a07b6b3de402fc98adb2d591ece70a Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 3 Feb 2026 04:43:13 +0000 Subject: [PATCH 07/58] Update net.sourceforge.pmd to v7.21.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d0627743..803cb4d3 100644 --- a/pom.xml +++ b/pom.xml @@ -83,12 +83,12 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.21.0 net.sourceforge.pmd pmd-java - 7.20.0 + 7.21.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 597d8238..cdb13a0e 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -253,12 +253,12 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.21.0 net.sourceforge.pmd pmd-java - 7.20.0 + 7.21.0 From 78e6f922261869bc7a6f939d185e46e35ed3f0aa Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 4 Feb 2026 12:01:54 +0100 Subject: [PATCH 08/58] Updat to PMD 7.21.0 --- .config/pmd/java/ruleset.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml index e96576b1..e2325a9c 100644 --- a/.config/pmd/java/ruleset.xml +++ b/.config/pmd/java/ruleset.xml @@ -146,7 +146,6 @@ - @@ -164,6 +163,7 @@ + From 076ea0fc43b6354042220d357fa595eeebf32f0b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 6 Feb 2026 04:44:15 +0000 Subject: [PATCH 09/58] Update dependency com.puppycrawl.tools:checkstyle to v13.2.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d0627743..45d9bd42 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 13.1.0 + 13.2.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 597d8238..0ea5a268 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -215,7 +215,7 @@ com.puppycrawl.tools checkstyle - 13.1.0 + 13.2.0 From 53fd592ee4f17dc3cc9018943131c1496fd73508 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 16 Feb 2026 04:51:40 +0000 Subject: [PATCH 10/58] Update org.junit to v6.0.3 --- codec-sha256/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- demo/integration-tests/pom.xml | 2 +- demo/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 7ddf62fb..8bd93471 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -53,7 +53,7 @@ org.junit.jupiter junit-jupiter - 6.0.2 + 6.0.3 test diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 8de1278f..be3413a2 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -53,7 +53,7 @@ org.junit.jupiter junit-jupiter - 6.0.2 + 6.0.3 test diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index b72552cd..8092e15b 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -72,7 +72,7 @@ org.junit junit-bom - 6.0.2 + 6.0.3 pom import diff --git a/demo/pom.xml b/demo/pom.xml index 778e7dc9..eb3c67e0 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -97,7 +97,7 @@ org.junit junit-bom - 6.0.2 + 6.0.3 pom import diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 847f5d09..4cb0dd6b 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -87,7 +87,7 @@ org.junit.jupiter junit-jupiter - 6.0.2 + 6.0.3 test diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 948368fd..c469343b 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -106,7 +106,7 @@ org.junit.jupiter junit-jupiter - 6.0.2 + 6.0.3 test diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 883caa89..32043608 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -98,7 +98,7 @@ org.junit.jupiter junit-jupiter - 6.0.2 + 6.0.3 test From 76cf22386537f750c979b63658ab3459f6b8586c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 20 Feb 2026 08:43:59 +0100 Subject: [PATCH 11/58] Disallow classes ending with Helper or Util Fixes https://github.com/xdev-software/java-setup-template/issues/7 --- .config/checkstyle/checkstyle.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index 463a629a..262c9f91 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -79,6 +79,11 @@ + + + + + From 8cabbd99a01205e009eb1218949815a4af813f97 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 22 Feb 2026 04:44:17 +0000 Subject: [PATCH 12/58] Update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.5.5 --- codec-sha256/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- demo/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 7ddf62fb..e441ab2c 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 8de1278f..5608b475 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 diff --git a/demo/pom.xml b/demo/pom.xml index 778e7dc9..0ac7b30b 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 847f5d09..09852569 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 948368fd..90dff7ab 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -203,7 +203,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 883caa89..52d7aa4c 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.4 + 3.5.5 From 838f350c5da393d455f0b1de29397762af9111ac Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 23 Feb 2026 09:54:21 +0100 Subject: [PATCH 13/58] Avoid using Optional#get Fixes https://github.com/xdev-software/java-setup-template/issues/8 --- .config/pmd/java/ruleset.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.config/pmd/java/ruleset.xml b/.config/pmd/java/ruleset.xml index e2325a9c..9dc7a0fa 100644 --- a/.config/pmd/java/ruleset.xml +++ b/.config/pmd/java/ruleset.xml @@ -208,6 +208,36 @@ + + +`Optional#get` can be interpreted as a getter by developers, however this is not the case as it throws an exception when empty. + +It should be replaced by +* doing a mapping directly using `.map` or `.ifPresent` +* using the preferred `.orElseThrow`, `.orElse` or `.or` methods + +Java Developer Brian Goetz also writes regarding this topic: + +> Java 8 was a huge improvement to the platform, but one of the few mistakes we made was the naming of `Optional.get()`, because the name just invites people to call it without calling `isPresent()`, undermining the whole point of using `Optional` in the first place. +> +> During the Java 9 time frame, we proposed to deprecate `Optional.get()`, but the public response to that was ... let's say cold. As a smaller step, we introduced `orElseThrow()` in 10 (see [JDK-8140281](https://bugs.openjdk.java.net/browse/JDK-8140281)) as a more transparently named synonym for the current pernicious behavior of `get()`. IDEs warn on unconditional use of `get()`, but not on `orElseThrow()`, which is a step forward in teaching people to code better. The question is, in a sense, a "glass half empty" view of the current situation; `get()` is still problematic. + + 3 + + + + + + + + + Date: Thu, 26 Feb 2026 04:42:27 +0000 Subject: [PATCH 14/58] Update lycheeverse/lychee-action digest to 8646ba3 --- .github/workflows/broken-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index e6c33857..d7682594 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -18,7 +18,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2 + uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2 with: fail: false # Don't fail on broken links, create an issue instead From 8b6624e632e759013ba7aa24ba6ec36f4951f500 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 26 Feb 2026 04:45:51 +0000 Subject: [PATCH 15/58] Update lycheeverse/lychee-action digest to 8646ba3 --- .github/workflows/broken-links.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 2675c8b6..5b50d06e 100644 --- a/.github/workflows/broken-links.yml +++ b/.github/workflows/broken-links.yml @@ -19,7 +19,7 @@ jobs: - name: Link Checker id: lychee - uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2 + uses: lycheeverse/lychee-action@8646ba30535128ac92d33dfc9133794bfdd9b411 # v2 with: fail: false # Don't fail on broken links, create an issue instead From a53730bb4a5a0765d9972d93dd5884253f67b619 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 27 Feb 2026 04:43:58 +0000 Subject: [PATCH 16/58] Update actions/upload-artifact action to v7 --- .github/workflows/check-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index b1a6d66f..b5d79950 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -69,7 +69,7 @@ jobs: fi - name: Upload demo files - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar @@ -152,7 +152,7 @@ jobs: - name: Upload report if: always() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: pmd-report if-no-files-found: ignore From 0dcf9cfe57c8d8c8ace1253845b67afb8bd47bda Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 1 Mar 2026 04:48:23 +0000 Subject: [PATCH 17/58] Update dependency com.puppycrawl.tools:checkstyle to v13.3.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2192804..e214afa5 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 13.2.0 + 13.3.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 9e08842f..2547c6f1 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -215,7 +215,7 @@ com.puppycrawl.tools checkstyle - 13.2.0 + 13.3.0 From 77e37f981ecf107f1ebb690beb75262b3314b38e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 2 Mar 2026 04:46:12 +0000 Subject: [PATCH 18/58] Update dependency net.sourceforge.pmd:pmd-core to v7.22.0 [SECURITY] --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2192804..4cac133d 100644 --- a/pom.xml +++ b/pom.xml @@ -83,7 +83,7 @@ net.sourceforge.pmd pmd-core - 7.21.0 + 7.22.0 net.sourceforge.pmd diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 9e08842f..4a20d6de 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -253,7 +253,7 @@ net.sourceforge.pmd pmd-core - 7.21.0 + 7.22.0 net.sourceforge.pmd From 961291c3795ca9f249ce028fe98fe1524da6b0fb Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 2 Mar 2026 04:46:14 +0000 Subject: [PATCH 19/58] Update dependency net.sourceforge.pmd:pmd-java to v7.22.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a2192804..97f7b183 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ net.sourceforge.pmd pmd-java - 7.21.0 + 7.22.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 9e08842f..38314000 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -258,7 +258,7 @@ net.sourceforge.pmd pmd-java - 7.21.0 + 7.22.0 From 6f9b5b39e904c2167782591b14a645b1fd49b730 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 2 Mar 2026 12:00:46 +0100 Subject: [PATCH 20/58] Create report-gha-workflow-security-problems.yml Fixes https://github.com/xdev-software/base-template/issues/13 --- .../report-gha-workflow-security-problems.yml | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 .github/workflows/report-gha-workflow-security-problems.yml diff --git a/.github/workflows/report-gha-workflow-security-problems.yml b/.github/workflows/report-gha-workflow-security-problems.yml new file mode 100644 index 00000000..b17aa539 --- /dev/null +++ b/.github/workflows/report-gha-workflow-security-problems.yml @@ -0,0 +1,61 @@ +name: Report workflow security problems + +on: + workflow_dispatch: + push: + branches: [ develop ] + paths: + - '.github/workflows/**' + +permissions: + issues: write + +jobs: + prt: + runs-on: ubuntu-latest + timeout-minutes: 15 + # Only run this in our repos (Prevent notification spam by forks) + if: ${{ github.repository_owner == 'xdev-software' }} + steps: + - uses: actions/checkout@v6 + + - name: Check + id: check + run: | + grep -l 'pull_request_target:' --exclude report-gha-workflow-security-problems.yml *.yml > reported.txt && exit 1 || exit 0 + working-directory: .github/workflows + + - name: Find already existing issue + id: find-issue + if: ${{ !cancelled() }} + run: | + echo "number=$(gh issue list -l 'bug' -l 'automated' -L 1 -S 'in:title "Incorrectly configure GHA workflow (prt)"' -s 'open' --json 'number' --jq '.[].number')" >> $GITHUB_OUTPUT + env: + GH_TOKEN: ${{ github.token }} + + - name: Close issue if everything is fine + if: ${{ success() && steps.find-issue.outputs.number != '' }} + run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }} + env: + GH_TOKEN: ${{ github.token }} + + - name: Create report + if: ${{ failure() && steps.check.conclusion == 'failure' }} + run: | + echo 'Detected usage of `pull_request_target`. This event is dangerous and MUST NOT BE USED AT ALL COST!' > reported.md + echo '' >> reported.md + echo '/cc @xdev-software/gha-workflow-security' >> reported.md + echo '' >> reported.md + echo '```' >> reported.md + cat .github/workflows/reported.txt >> reported.md + echo '```' >> reported.md + cat reported.md + + - name: Create Issue From File + if: ${{ failure() && steps.check.conclusion == 'failure' }} + uses: peter-evans/create-issue-from-file@fca9117c27cdc29c6c4db3b86c48e4115a786710 # v6 + with: + issue-number: ${{ steps.find-issue.outputs.number }} + title: 'Incorrectly configure GHA workflow (prt)' + content-filepath: ./reported.md + labels: bug, automated From 42dc90b3195e1e69fa68bd4229ed033f43475ccb Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 6 Mar 2026 11:26:43 +0100 Subject: [PATCH 21/58] Ignore cancelled builds --- .github/workflows/check-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index b5d79950..daae7b26 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -151,7 +151,7 @@ jobs: run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C - name: Upload report - if: always() + if: ${{ !cancelled() }} uses: actions/upload-artifact@v7 with: name: pmd-report From 84e1242d26dadb2a8522dbaaa1563c0e613bf086 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 9 Mar 2026 10:01:24 +0100 Subject: [PATCH 22/58] Enforce use of PMD plugin After feedback from colleague --- .idea/externalDependencies.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml index 78be5b8e..0b477b88 100644 --- a/.idea/externalDependencies.xml +++ b/.idea/externalDependencies.xml @@ -3,5 +3,6 @@ + \ No newline at end of file From c8c9580accc185c3a234fda3012d41c089d0d913 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 10 Mar 2026 04:42:30 +0000 Subject: [PATCH 23/58] Update dependency maven to v3.9.13 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8dea6c22..71ea75a7 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.13/apache-maven-3.9.13-bin.zip From 4951b0b479fcf878b6ff00a3b1be5f3b465b25c0 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 13 Mar 2026 04:44:06 +0000 Subject: [PATCH 24/58] Update dependency maven to v3.9.14 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 71ea75a7..c595b009 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.13/apache-maven-3.9.13-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip From cbd7ac875acfbd2d36c29ffcbcbebcf315560235 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 15 Mar 2026 04:56:46 +0000 Subject: [PATCH 25/58] Update shogo82148/actions-create-release digest to 6a39603 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3f55399a..2b7941be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -91,7 +91,7 @@ jobs: - name: Create Release id: create-release - uses: shogo82148/actions-create-release@559c27ce7eb834825e2b55927c64f6d1bd1db716 # v1 + uses: shogo82148/actions-create-release@6a396031bc74c57403da1018fec74d24c6aa03cd # v1 with: tag_name: v${{ steps.version.outputs.release }} release_name: v${{ steps.version.outputs.release }} From 655c24de6c393bef99f2c65ba8e4beaaf5ccd91b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Fri, 27 Mar 2026 04:57:41 +0000 Subject: [PATCH 26/58] Update org.springframework.boot to v4.0.5 --- crypto-symmetric-managed/pom.xml | 2 +- csp/pom.xml | 2 +- demo/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index 20d5869a..35b34da2 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/csp/pom.xml b/csp/pom.xml index 4d59093d..0623d31d 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/demo/pom.xml b/demo/pom.xml index 778e7dc9..f5403b14 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -24,7 +24,7 @@ 25.0.4 - 4.0.2 + 4.0.5 diff --git a/metrics/pom.xml b/metrics/pom.xml index 899a6e2d..512b7b5f 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 847f5d09..c07693f7 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 948368fd..c4c63838 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/vaadin/pom.xml b/vaadin/pom.xml index e5feaabb..9c9986a2 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 883caa89..32ebc277 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index 5e9cc84b..fffdd86a 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import diff --git a/web/pom.xml b/web/pom.xml index 575e2dd8..1bad5e77 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -54,7 +54,7 @@ org.springframework.boot spring-boot-dependencies - 4.0.2 + 4.0.5 pom import From b6c60e60be46f6fa52a6fe415e0e0b16e8e2b886 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 28 Mar 2026 04:47:46 +0000 Subject: [PATCH 27/58] Update net.sourceforge.pmd to v7.23.0 --- pom.xml | 4 ++-- template-placeholder/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 4d536359..c19848ee 100644 --- a/pom.xml +++ b/pom.xml @@ -83,12 +83,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index abef60d6..5931b6c2 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -253,12 +253,12 @@ net.sourceforge.pmd pmd-core - 7.22.0 + 7.23.0 net.sourceforge.pmd pmd-java - 7.22.0 + 7.23.0 From 7192c1a29f1848257b77974333a1108d2869db49 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 30 Mar 2026 05:09:13 +0000 Subject: [PATCH 28/58] Update dependency com.puppycrawl.tools:checkstyle to v13.4.0 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4d536359..1f91c95f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index abef60d6..97dc504b 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -215,7 +215,7 @@ com.puppycrawl.tools checkstyle - 13.3.0 + 13.4.0 From 225c79b88ca0fb52a376de459f5ed4c7890a498f Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 30 Mar 2026 14:59:05 +0200 Subject: [PATCH 29/58] Prepare for new templating system --- .config/topo/upstream.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/topo/upstream.yml diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml new file mode 100644 index 00000000..d78d8935 --- /dev/null +++ b/.config/topo/upstream.yml @@ -0,0 +1,2 @@ +- url: https://github.com/xdev-software/base-template.git + branch: master From fcf8b930e9544886a329758cd7fe21ad474bd337 Mon Sep 17 00:00:00 2001 From: "Alex \"Blex\" B" <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:01:53 +0200 Subject: [PATCH 30/58] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index d78d8935..7821ddf6 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/base-template.git +- url: https://github.com/xdev-software/java-template.git branch: master From 3e30eebf5761e3e4ba41e2576938445c49500200 Mon Sep 17 00:00:00 2001 From: "Alex \"Blex\" B" <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 30 Mar 2026 15:05:59 +0200 Subject: [PATCH 31/58] Create upstream.yml --- .config/topo/upstream.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .config/topo/upstream.yml diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml new file mode 100644 index 00000000..8627eae1 --- /dev/null +++ b/.config/topo/upstream.yml @@ -0,0 +1,2 @@ +- url: https://github.com/xdev-software/java-setup-template.git + branch: master From 687c673ae447c3881b1c6fc8541111ccf847c842 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 30 Mar 2026 15:11:51 +0200 Subject: [PATCH 32/58] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index d78d8935..7821ddf6 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/base-template.git +- url: https://github.com/xdev-software/java-template.git branch: master From fa9ccfa8a0714ff512fb760675b7f14bf0534f21 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 31 Mar 2026 09:54:49 +0200 Subject: [PATCH 33/58] Update upstream.yml --- .config/topo/upstream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/topo/upstream.yml b/.config/topo/upstream.yml index 7821ddf6..0cc67cd2 100644 --- a/.config/topo/upstream.yml +++ b/.config/topo/upstream.yml @@ -1,2 +1,2 @@ -- url: https://github.com/xdev-software/java-template.git +- url: https://github.com/xdev-software/standard-maven-template.git branch: master From c0e52bd19d9671cf5b53ddfffd8ba4fae4b86b67 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 31 Mar 2026 14:08:01 +0200 Subject: [PATCH 34/58] Delete update-from-template.yml Will be managed centrally now --- .github/workflows/update-from-template.yml | 318 --------------------- 1 file changed, 318 deletions(-) delete mode 100644 .github/workflows/update-from-template.yml diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml deleted file mode 100644 index 7cff5596..00000000 --- a/.github/workflows/update-from-template.yml +++ /dev/null @@ -1,318 +0,0 @@ -name: Update from Template - -# This workflow keeps the repo up to date with changes from the template repo (REMOTE_URL) -# It duplicates the REMOTE_BRANCH (into UPDATE_BRANCH) and tries to merge it into -# this repos default branch (which is checked out here) -# Note that this requires a PAT (Personal Access Token) - at best from a servicing account -# PAT permissions: read:discussion, read:org, repo, workflow -# Also note that you should have at least once merged the template repo into the current repo manually -# otherwise a "refusing to merge unrelated histories" error might occur. - -on: - schedule: - - cron: '55 2 * * 1' - workflow_dispatch: - inputs: - no_automatic_merge: - type: boolean - description: 'No automatic merge' - default: false - -env: - UPDATE_BRANCH: update-from-template - UPDATE_BRANCH_MERGED: update-from-template-merged - REMOTE_URL: https://github.com/xdev-software/base-template.git - REMOTE_BRANCH: master - -permissions: - contents: write - pull-requests: write - -jobs: - update: - runs-on: ubuntu-latest - outputs: - update_branch_merged_commit: ${{ steps.manage-branches.outputs.update_branch_merged_commit }} - create_update_branch_merged_pr: ${{ steps.manage-branches.outputs.create_update_branch_merged_pr }} - steps: - - uses: actions/checkout@v6 - with: - # Required because otherwise there are always changes detected when executing diff/rev-list - fetch-depth: 0 - # If no PAT is used the following error occurs on a push: - # refusing to allow a GitHub App to create or update workflow `.github/workflows/xxx.yml` without `workflows` permission - token: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - - - name: Init Git - run: | - git config --global user.email "111048771+xdev-gh-bot@users.noreply.github.com" - git config --global user.name "XDEV Bot" - - - name: Manage branches - id: manage-branches - run: | - echo "Adding remote template-repo" - git remote add template ${{ env.REMOTE_URL }} - - echo "Fetching remote template repo" - git fetch template - - echo "Deleting local branches that will contain the updates - if present" - git branch -D ${{ env.UPDATE_BRANCH }} || true - git branch -D ${{ env.UPDATE_BRANCH_MERGED }} || true - - echo "Checking if the remote template repo has new commits" - git rev-list ..template/${{ env.REMOTE_BRANCH }} - - if [ $(git rev-list --count ..template/${{ env.REMOTE_BRANCH }}) -eq 0 ]; then - echo "There are no commits new commits on the template repo" - - echo "Deleting origin branch(es) that contain the updates - if present" - git push -f origin --delete ${{ env.UPDATE_BRANCH }} || true - git push -f origin --delete ${{ env.UPDATE_BRANCH_MERGED }} || true - - echo "create_update_branch_pr=0" >> $GITHUB_OUTPUT - echo "create_update_branch_merged_pr=0" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "Found new commits on the template repo" - - echo "Creating update branch" - git branch ${{ env.UPDATE_BRANCH }} template/${{ env.REMOTE_BRANCH }} - git branch --unset-upstream ${{ env.UPDATE_BRANCH }} - - echo "Pushing update branch" - git push -f -u origin ${{ env.UPDATE_BRANCH }} - - echo "Getting base branch" - base_branch=$(git branch --show-current) - echo "Base branch is $base_branch" - echo "base_branch=$base_branch" >> $GITHUB_OUTPUT - - echo "Trying to create auto-merged branch ${{ env.UPDATE_BRANCH_MERGED }}" - git branch ${{ env.UPDATE_BRANCH_MERGED }} ${{ env.UPDATE_BRANCH }} - git checkout ${{ env.UPDATE_BRANCH_MERGED }} - - echo "Merging branch $base_branch into ${{ env.UPDATE_BRANCH_MERGED }}" - git merge $base_branch && merge_exit_code=$? || merge_exit_code=$? - if [ $merge_exit_code -ne 0 ]; then - echo "Auto merge failed! Manual merge required" - echo "::notice ::Auto merge failed - Manual merge required" - - echo "Cleaning up failed merge" - git merge --abort - git checkout $base_branch - git branch -D ${{ env.UPDATE_BRANCH_MERGED }} || true - - echo "Deleting auto-merge branch - if present" - git push -f origin --delete ${{ env.UPDATE_BRANCH_MERGED }} || true - - echo "create_update_branch_pr=1" >> $GITHUB_OUTPUT - echo "create_update_branch_merged_pr=0" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "Post processing: Trying to automatically fill in template variables" - find . -type f \ - -not -path "./.git/**" \ - -not -path "./.github/workflows/update-from-template.yml" -print0 \ - | xargs -0 sed -i "s/template-placeholder/${GITHUB_REPOSITORY#*/}/g" - - git status - git add --all - - if [[ "$(git status --porcelain)" != "" ]]; then - echo "Filled in template; Committing" - - git commit -m "Fill in template" - fi - - echo "Pushing auto-merged branch" - git push -f -u origin ${{ env.UPDATE_BRANCH_MERGED }} - - echo "update_branch_merged_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - - echo "Restoring base branch $base_branch" - git checkout $base_branch - - echo "create_update_branch_pr=0" >> $GITHUB_OUTPUT - echo "create_update_branch_merged_pr=1" >> $GITHUB_OUTPUT - echo "try_close_update_branch_pr=1" >> $GITHUB_OUTPUT - - - name: Create/Update PR update_branch - if: steps.manage-branches.outputs.create_update_branch_pr == 1 - env: - GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - run: | - gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@") - } - gh_pr_up -B "${{ steps.manage-branches.outputs.base_branch }}" \ - --title "Update from template" \ - --body "An automated PR to sync changes from the template into this repo" - - # Ensure that only a single PR is open (otherwise confusion and spam) - - name: Close PR update_branch - if: steps.manage-branches.outputs.try_close_update_branch_pr == 1 - env: - GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - run: | - gh pr close "${{ env.UPDATE_BRANCH }}" || true - - - name: Create/Update PR update_branch_merged - if: steps.manage-branches.outputs.create_update_branch_merged_pr == 1 - env: - GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - run: | - gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH_MERGED }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH_MERGED }}" && gh pr edit "$@") - } - gh_pr_up -B "${{ steps.manage-branches.outputs.base_branch }}" \ - --title "Update from template (auto-merged)" \ - --body "An automated PR to sync changes from the template into this repo" - - # Wait a moment so that checks of PR have higher prio than following job - sleep 3 - - # Split into two jobs to help with executor starvation - auto-merge: - needs: [update] - if: needs.update.outputs.create_update_branch_merged_pr == 1 - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - with: - # Required because otherwise there are always changes detected when executing diff/rev-list - fetch-depth: 0 - # If no PAT is used the following error occurs on a push: - # refusing to allow a GitHub App to create or update workflow `.github/workflows/xxx.yml` without `workflows` permission - token: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - - - name: Init Git - run: | - git config --global user.email "111048771+xdev-gh-bot@users.noreply.github.com" - git config --global user.name "XDEV Bot" - - - name: Checking if auto-merge for PR update_branch_merged can be done - id: auto-merge-check - env: - GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} - run: | - not_failed_conclusion="skipped|neutral|success" - not_relevant_app_slug="dependabot|github-pages|sonarqubecloud" - - echo "Waiting for checks to start..." - sleep 40s - - for i in {1..20}; do - echo "Checking if PR can be auto-merged. Try: $i" - - echo "Checking if update-branch-merged exists" - git fetch - if [[ $(git ls-remote --heads origin refs/heads/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then - echo "Branch still exists; Continuing..." - else - echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing" - exit 0 - fi - - echo "Fetching checks" - cs_response=$(curl -sL \ - --fail-with-body \ - --connect-timeout 60 \ - --max-time 120 \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer $GH_TOKEN" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/${{ github.repository }}/commits/${{ needs.update.outputs.update_branch_merged_commit }}/check-suites) - - cs_data=$(echo $cs_response | jq '.check_suites[] | { conclusion: .conclusion, slug: .app.slug, check_runs_url: .check_runs_url }') - echo $cs_data - - if [[ -z "$cs_data" ]]; then - echo "No check suite data - Assuming that there are no checks to run" - - echo "perform=1" >> $GITHUB_OUTPUT - exit 0 - fi - - cs_failed=$(echo $cs_data | jq --arg x "$not_failed_conclusion" 'select ((.conclusion == null or (.conclusion | test($x))) | not)') - if [[ -z "$cs_failed" ]]; then - echo "No check failed so far; Checking if relevant checks are still running" - - cs_relevant_still_running=$(echo $cs_data | jq --arg x "$not_relevant_app_slug" 'select (.conclusion == null and (.slug | test($x) | not))') - if [[ -z $cs_relevant_still_running ]]; then - echo "All relevant checks finished - PR can be merged" - - echo "perform=1" >> $GITHUB_OUTPUT - exit 0 - else - echo "Relevant checks are still running" - echo $cs_relevant_still_running - fi - else - echo "Detected failed check" - echo $cs_failed - - echo "perform=0" >> $GITHUB_OUTPUT - exit 0 - fi - - echo "Waiting before next run..." - sleep 30s - done - - echo "Timed out - Assuming executor starvation - Forcing merge" - echo "perform=1" >> $GITHUB_OUTPUT - - - name: Auto-merge update_branch_merged - if: steps.auto-merge-check.outputs.perform == 1 - run: | - echo "Getting base branch" - base_branch=$(git branch --show-current) - echo "Base branch is $base_branch" - - echo "Fetching..." - git fetch - if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then - echo "Branch still exists; Continuing..." - else - echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing" - exit 0 - fi - - expected_commit="${{ needs.update.outputs.update_branch_merged_commit }}" - actual_commit=$(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) - if [[ "$expected_commit" != "$actual_commit" ]]; then - echo "Branch ${{ env.UPDATE_BRANCH_MERGED }} contains unexpected commit $actual_commit" - echo "Expected: $expected_commit" - - exit 0 - fi - - echo "Ensuring that current branch $base_branch is up-to-date" - git pull - - echo "Merging origin/${{ env.UPDATE_BRANCH_MERGED }} into $base_branch" - git merge origin/${{ env.UPDATE_BRANCH_MERGED }} && merge_exit_code=$? || merge_exit_code=$? - if [ $merge_exit_code -ne 0 ]; then - echo "Unexpected merge failure $merge_exit_code - Requires manual resolution" - - exit 0 - fi - - if [[ "${{ inputs.no_automatic_merge }}" == "true" ]]; then - echo "Exiting due no_automatic_merge" - - exit 0 - fi - - echo "Pushing" - git push - - echo "Cleaning up" - git branch -D ${{ env.UPDATE_BRANCH }} || true - git branch -D ${{ env.UPDATE_BRANCH_MERGED }} || true - git push -f origin --delete ${{ env.UPDATE_BRANCH }} || true - git push -f origin --delete ${{ env.UPDATE_BRANCH_MERGED }} || true From 686a889bdbea3113479b28b07d81545c47417fe4 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:05:26 +0000 Subject: [PATCH 35/58] Update dependency org.springdoc:springdoc-openapi-starter-webmvc-ui to v3.0.2 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index b08e5392..bfe10b36 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -82,7 +82,7 @@ org.springdoc springdoc-openapi-starter-webmvc-ui - 3.0.1 + 3.0.2 From ab4959c1a157a2f9f58b29f60318866fb0a07f92 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:05:32 +0000 Subject: [PATCH 36/58] Update dependency org.testcontainers:testcontainers-bom to v2.0.4 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 8092e15b..f879fa37 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -91,7 +91,7 @@ org.testcontainers testcontainers-bom - 2.0.3 + 2.0.4 pom import From 19cc534483cd33ec92363d73d523e9713e78c8f6 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:05:37 +0000 Subject: [PATCH 37/58] Update dependency software.xdev:testcontainers-selenium to v1.5.3 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 8092e15b..92f4cf1a 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -81,7 +81,7 @@ software.xdev testcontainers-selenium - 1.5.2 + 1.5.3 software.xdev From 2ce1af2970cd0274309aae08f3680d74cfe7569b Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:05:57 +0000 Subject: [PATCH 38/58] Update dependency com.puppycrawl.tools:checkstyle to v13.4.0 --- codec-sha256/pom.xml | 2 +- crypto-symmetric-managed/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- csp/pom.xml | 2 +- demo/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 0942b3fe..01093ef3 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -230,7 +230,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index 35b34da2..017d6832 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -250,7 +250,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 5f32750c..a2f99c38 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -230,7 +230,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/csp/pom.xml b/csp/pom.xml index 0623d31d..a0a6ba49 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -239,7 +239,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/demo/pom.xml b/demo/pom.xml index b08e5392..8d2fb0ab 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -249,7 +249,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 512b7b5f..317359dd 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -234,7 +234,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 4cbb0729..48485292 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -264,7 +264,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 6d3fe877..0e577fd6 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -283,7 +283,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 9c9986a2..5b8d3e43 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -280,7 +280,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 4f6ff11e..6b1cf716 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -275,7 +275,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index fffdd86a..35e59fcc 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -244,7 +244,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 diff --git a/web/pom.xml b/web/pom.xml index 1bad5e77..6af0b26a 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -238,7 +238,7 @@ com.puppycrawl.tools checkstyle - 13.0.0 + 13.4.0 From 3074dee77f1dbd526090aec5295301138a380536 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:06:07 +0000 Subject: [PATCH 39/58] Update dependency net.sourceforge.pmd:pmd-java to v7.23.0 --- codec-sha256/pom.xml | 2 +- crypto-symmetric-managed/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- csp/pom.xml | 2 +- demo/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 0942b3fe..eb2b0e0a 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -273,7 +273,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index 35b34da2..5271798a 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -292,7 +292,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 5f32750c..a18cd660 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -273,7 +273,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/csp/pom.xml b/csp/pom.xml index 0623d31d..f018f283 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -282,7 +282,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/demo/pom.xml b/demo/pom.xml index b08e5392..96941ee4 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -295,7 +295,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 512b7b5f..c3475a62 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -277,7 +277,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 4cbb0729..372e3b18 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -307,7 +307,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 6d3fe877..1e782594 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -326,7 +326,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 9c9986a2..18fe8a92 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -323,7 +323,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 4f6ff11e..892dc596 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -318,7 +318,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index fffdd86a..1513a60f 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -287,7 +287,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 diff --git a/web/pom.xml b/web/pom.xml index 1bad5e77..70ae5946 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -281,7 +281,7 @@ net.sourceforge.pmd pmd-java - 7.20.0 + 7.23.0 From 121589855137e43a5290c10ba9006e70b8f3aeaf Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:06:09 +0000 Subject: [PATCH 40/58] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.15.0 --- codec-sha256/pom.xml | 2 +- crypto-symmetric-managed/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- csp/pom.xml | 2 +- demo/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 0942b3fe..170c9e20 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index 35b34da2..b452379d 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 5f32750c..2e2cd7dd 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -106,7 +106,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/csp/pom.xml b/csp/pom.xml index 0623d31d..1bcb58c5 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -121,7 +121,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/demo/pom.xml b/demo/pom.xml index b08e5392..f2135f56 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -190,7 +190,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/metrics/pom.xml b/metrics/pom.xml index 512b7b5f..85971e27 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -116,7 +116,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 4cbb0729..d217b7c4 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -140,7 +140,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 6d3fe877..22d872d9 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -159,7 +159,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 9c9986a2..42dd3b7c 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -162,7 +162,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 4f6ff11e..5d2ce62a 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index fffdd86a..e3659ab0 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -126,7 +126,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} diff --git a/web/pom.xml b/web/pom.xml index 1bad5e77..590bac5c 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -120,7 +120,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.14.1 + 3.15.0 ${maven.compiler.release} From b44f0eaa930b9b683d05f9c18567bcdc74be44ca Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:06:12 +0000 Subject: [PATCH 41/58] Update dependency org.seleniumhq.selenium:selenium-dependencies-bom to v4.41.0 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 8092e15b..894f507d 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -62,7 +62,7 @@ org.seleniumhq.selenium selenium-dependencies-bom - 4.40.0 + 4.41.0 pom import From 26fed781cedb89d63a7da1983def0f9d8d3946d2 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:08:33 +0000 Subject: [PATCH 42/58] Update dependency io.github.git-commit-id:git-commit-id-maven-plugin to v9.1.0 --- demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/pom.xml b/demo/pom.xml index a0548bb4..cabb5840 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -224,7 +224,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 9.0.2 + 9.1.0 From bf985ca6777b9851aa78b02829378a7703c4c04e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:08:43 +0000 Subject: [PATCH 43/58] Update actions/upload-artifact action to v7 --- .github/workflows/run-integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 03593311..40091bc2 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -69,7 +69,7 @@ jobs: - name: Upload videos of test failures if: failure() - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: test-fail-videos-${{ matrix.java }}-${{ env.PROJECT_NORMALIZED }}-${{ matrix.parallel }}-${{ matrix.pre-start }} path: demo/integration-tests/${{ matrix.project }}/target/records From e100db6525589e9394f10f284cd5901c39338ce7 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:08:46 +0000 Subject: [PATCH 44/58] Update dependency software.xdev:testcontainers-selenium to v2 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index aa85144a..38bd76a0 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -81,7 +81,7 @@ software.xdev testcontainers-selenium - 1.5.3 + 2.0.0 software.xdev From a60443f2d2139b018c5d0c057d0b95235aec7286 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:09:40 +0200 Subject: [PATCH 45/58] Update pmd --- codec-sha256/pom.xml | 2 +- crypto-symmetric-managed/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- csp/pom.xml | 2 +- demo/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index 1ee8c97f..bcaf9e24 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -268,7 +268,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index fc66235b..904afe53 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -287,7 +287,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 9899bdbd..6b8b1239 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -268,7 +268,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/csp/pom.xml b/csp/pom.xml index 275dadfa..9f098024 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -277,7 +277,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/demo/pom.xml b/demo/pom.xml index a0548bb4..19dba4d7 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -290,7 +290,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/metrics/pom.xml b/metrics/pom.xml index 0396d8a0..95d98a3d 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -272,7 +272,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index 91d25daf..d8df9edf 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -302,7 +302,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 9de83141..312390de 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -321,7 +321,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 7eb8859b..2e9ad744 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -318,7 +318,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index 016d7b90..fbc75237 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -313,7 +313,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index 5de8b402..3f0bf1a1 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -282,7 +282,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd diff --git a/web/pom.xml b/web/pom.xml index f5ff1fb0..c479edba 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -276,7 +276,7 @@ net.sourceforge.pmd pmd-core - 7.20.0 + 7.23.0 net.sourceforge.pmd From c434dcf4a85482cb91ef9ae070719dd0c1a20750 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:11:47 +0000 Subject: [PATCH 46/58] Update dependency software.xdev.tci:bom to v3.3.0 --- demo/integration-tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 38bd76a0..20fe59c8 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -99,7 +99,7 @@ software.xdev.tci bom - 3.0.3 + 3.3.0 pom import From cc763f28439abfcaf28ff9ba9afc23c8b62940be Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:14:26 +0200 Subject: [PATCH 47/58] Rework meta-model logic --- demo/entities-metamodel/pom.xml | 61 --------------------------------- demo/entities/pom.xml | 37 ++++++++++++++++++++ demo/pom.xml | 14 -------- 3 files changed, 37 insertions(+), 75 deletions(-) diff --git a/demo/entities-metamodel/pom.xml b/demo/entities-metamodel/pom.xml index 584c3baf..936f5e75 100644 --- a/demo/entities-metamodel/pom.xml +++ b/demo/entities-metamodel/pom.xml @@ -12,8 +12,6 @@ entities-metamodel - ${project.basedir}/../entities/src/main/java - ${project.basedir}/src/gen/java/ src/gen/java/** @@ -25,64 +23,5 @@ software.xdev.sse.demo entities - - - org.hibernate.orm - hibernate-processor - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source-metamodel - generate-sources - - add-source - - - - ${project.generated.sources} - - - - - - - - org.bsc.maven - maven-processor-plugin - - - process - - process - - generate-sources - - ${metamodel.sourceDir} - ${project.generated.sources} - - - - - - - -implicit:class -AfullyAnnotationConfigured=true -AaddGeneratedAnnotation=false -Aindex=false - - - - org.hibernate.processor.HibernateProcessor - - - - - - - diff --git a/demo/entities/pom.xml b/demo/entities/pom.xml index d7a4a0c5..958c722a 100644 --- a/demo/entities/pom.xml +++ b/demo/entities/pom.xml @@ -26,4 +26,41 @@ jakarta.validation-api + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + generate-meta-model + + compile + + compile + + + + org.hibernate.orm + hibernate-processor + + + + org.hibernate.processor.HibernateProcessor + + + -proc:only + -AfullyAnnotationConfigured=true + -AaddGeneratedAnnotation=false + -Aindex=false + + ${project.basedir}/../entities-metamodel/src/gen/java/ + + + + + + + diff --git a/demo/pom.xml b/demo/pom.xml index 19dba4d7..f2d8372e 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -199,20 +199,6 @@ - - - org.codehaus.mojo - build-helper-maven-plugin - 3.6.1 - - - - - org.bsc.maven - maven-processor-plugin - 5.1 - - org.springframework.boot From b3f68e4195b5b18b030eb50f19a7e9b6322bb9d8 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:16:33 +0200 Subject: [PATCH 48/58] Migrate --- .../demo/webapp/base/AbstractBaseTest.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/demo/integration-tests/webapp-it-base/src/main/java/software/xdev/sse/demo/webapp/base/AbstractBaseTest.java b/demo/integration-tests/webapp-it-base/src/main/java/software/xdev/sse/demo/webapp/base/AbstractBaseTest.java index 432579eb..8bbb0804 100644 --- a/demo/integration-tests/webapp-it-base/src/main/java/software/xdev/sse/demo/webapp/base/AbstractBaseTest.java +++ b/demo/integration-tests/webapp-it-base/src/main/java/software/xdev/sse/demo/webapp/base/AbstractBaseTest.java @@ -9,6 +9,7 @@ import java.util.stream.Stream; import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.extension.AfterTestExecutionCallback; import org.junit.jupiter.api.extension.BeforeTestExecutionCallback; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtensionContext; @@ -28,13 +29,14 @@ import software.xdev.tci.concurrent.TCIExecutorServiceHolder; import software.xdev.tci.factory.prestart.PreStartableTCIFactory; import software.xdev.tci.factory.registry.TCIFactoryRegistry; +import software.xdev.tci.junit.jupiter.FileSystemFriendlyName; import software.xdev.tci.network.LazyNetworkPool; import software.xdev.tci.oidc.OIDCTCI; import software.xdev.tci.oidc.factory.OIDCTCIFactory; import software.xdev.tci.selenium.BrowserTCI; import software.xdev.tci.selenium.TestBrowser; import software.xdev.tci.selenium.factory.BrowsersTCIFactory; -import software.xdev.tci.selenium.testbase.SeleniumRecordingExtension; +import software.xdev.tci.selenium.testbase.SeleniumRecorder; import software.xdev.tci.tracing.TCITracer; @@ -310,20 +312,10 @@ protected BrowserTCI createBrowserInfra(final MutableCapabilities capabilities, // region Service binding implementations public static class TCSTSeleniumIntegrationTestExtension - extends SeleniumRecordingExtension - implements BeforeTestExecutionCallback + implements BeforeTestExecutionCallback, AfterTestExecutionCallback { private static final Logger LOG = LoggerFactory.getLogger(TCSTSeleniumIntegrationTestExtension.class); - public TCSTSeleniumIntegrationTestExtension() - { - super(context -> context.getTestInstance() - .filter(AbstractBaseTest.class::isInstance) - .map(AbstractBaseTest.class::cast) - .map(AbstractBaseTest::browserInfra) - .orElse(null)); - } - @Override public void beforeTestExecution(final ExtensionContext context) { @@ -331,13 +323,21 @@ public void beforeTestExecution(final ExtensionContext context) } @Override - public void afterTestExecution(final ExtensionContext context) throws Exception + public void afterTestExecution(final ExtensionContext context) { LOG.info("^^^^^^--END TEST--^^^^^^"); final Optional executionExceptionOpt = context.getExecutionException(); executionExceptionOpt.ifPresent(throwable -> LOG.error("Test-Failure", throwable)); - super.afterTestExecution(context); + final FileSystemFriendlyName fileSystemFriendlyName = new FileSystemFriendlyName(context); + + new SeleniumRecorder().afterTestAsync( + context, + context.getTestInstance() + .filter(AbstractBaseTest.class::isInstance) + .map(AbstractBaseTest.class::cast) + .map(AbstractBaseTest::browserInfra), + fileSystemFriendlyName).join(); } } From aafeeff2b5070501e9ed74b57806fd4b91fdb740 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:18:45 +0200 Subject: [PATCH 49/58] Fix compile --- demo/entities-metamodel/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demo/entities-metamodel/pom.xml b/demo/entities-metamodel/pom.xml index 936f5e75..8f310c55 100644 --- a/demo/entities-metamodel/pom.xml +++ b/demo/entities-metamodel/pom.xml @@ -24,4 +24,8 @@ entities + + + ${project.basedir}/src/gen/java/ + From 83393b96fba78902ac0df36939a2bbd9bcdee0c5 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 1 Apr 2026 13:19:43 +0000 Subject: [PATCH 50/58] Update com.vaadin to v25.1.1 --- demo/pom.xml | 2 +- vaadin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/pom.xml b/demo/pom.xml index 1fdd7f49..4ed84b21 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ UTF-8 - 25.0.4 + 25.1.1 4.0.5 diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 2e9ad744..b942006b 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -62,7 +62,7 @@ com.vaadin vaadin-bom - 25.0.4 + 25.1.1 pom import From 21150f57b11cd10fd6e27b696e97baa756c7c963 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:21:48 +0200 Subject: [PATCH 51/58] Fix CheckStyle --- CHANGELOG.md | 4 ++++ .../oauth2/rememberme/OAuth2CookieRememberMeServices.java | 6 +++--- .../disabledcheck/DefaultEmailOAuth2IsDisabledChecker.java | 4 ++-- ...kenUtil.java => OAuth2AuthenticationTokenExtractor.java} | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) rename oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/{OAuth2AuthenticationTokenUtil.java => OAuth2AuthenticationTokenExtractor.java} (92%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 363a1d6d..76085061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 2.1.0 +* Renamed `OAuth2AuthenticationTokenUtil` -> `OAuth2AuthenticationTokenExtractor` +* Updated dependencies + # 2.0.0 _Minimum required Java version: 21_ * Updated to Spring Boot 4.x diff --git a/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java b/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java index 3e124381..5e3fca83 100644 --- a/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java +++ b/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java @@ -64,7 +64,7 @@ import software.xdev.sse.oauth2.rememberme.secrets.AuthRememberMeSecretService; import software.xdev.sse.oauth2.rememberme.serializer.OAuth2CookieRememberMeAuthSerializer; import software.xdev.sse.oauth2.util.FastCookieFinder; -import software.xdev.sse.oauth2.util.OAuth2AuthenticationTokenUtil; +import software.xdev.sse.oauth2.util.OAuth2AuthenticationTokenExtractor; import software.xdev.sse.web.cookie.CookieSecureService; @@ -419,7 +419,7 @@ protected void validateDecodedData( final AuthRememberMeSecret authRememberMeSecret) { // token.getAuthorizedClientRegistrationId() was already validate during deserialization - final String email = OAuth2AuthenticationTokenUtil.getEmailAttribute(token); + final String email = OAuth2AuthenticationTokenExtractor.getEmailAttribute(token); if(!authRememberMeSecret.userEmailAddress().equals(email)) { throw new AutoLoginException( @@ -558,7 +558,7 @@ public void saveAuthToCookie( auth.getName()); } - final String email = OAuth2AuthenticationTokenUtil.getEmailAttribute(auth); + final String email = OAuth2AuthenticationTokenExtractor.getEmailAttribute(auth); if(email == null) { LOG.warn("Unable to save - No email"); diff --git a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/checkauth/disabledcheck/DefaultEmailOAuth2IsDisabledChecker.java b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/checkauth/disabledcheck/DefaultEmailOAuth2IsDisabledChecker.java index dce81cfb..87b659e2 100644 --- a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/checkauth/disabledcheck/DefaultEmailOAuth2IsDisabledChecker.java +++ b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/checkauth/disabledcheck/DefaultEmailOAuth2IsDisabledChecker.java @@ -23,7 +23,7 @@ import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken; import software.xdev.sse.oauth2.checkauth.EmailBasedOAuth2AuthCheckerUserService; -import software.xdev.sse.oauth2.util.OAuth2AuthenticationTokenUtil; +import software.xdev.sse.oauth2.util.OAuth2AuthenticationTokenExtractor; public class DefaultEmailOAuth2IsDisabledChecker implements OAuth2IsDisabledChecker @@ -38,7 +38,7 @@ public DefaultEmailOAuth2IsDisabledChecker(final EmailBasedOAuth2AuthCheckerUser @Override public boolean isDisabled(@Nullable final OAuth2AuthenticationToken token) { - return Optional.ofNullable(OAuth2AuthenticationTokenUtil.getEmailAttribute(token)) + return Optional.ofNullable(OAuth2AuthenticationTokenExtractor.getEmailAttribute(token)) .map(this.userService::isDisabled) .orElse(true); } diff --git a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenUtil.java b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenExtractor.java similarity index 92% rename from oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenUtil.java rename to oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenExtractor.java index b5f57a4e..28065d42 100644 --- a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenUtil.java +++ b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/OAuth2AuthenticationTokenExtractor.java @@ -23,7 +23,7 @@ import org.springframework.security.oauth2.core.oidc.StandardClaimNames; -public final class OAuth2AuthenticationTokenUtil +public final class OAuth2AuthenticationTokenExtractor { @Nullable public static String getEmailAttribute(final OAuth2AuthenticationToken token) @@ -37,7 +37,7 @@ public static String getEmailAttribute(final OAuth2AuthenticationToken token) .orElse(null); } - private OAuth2AuthenticationTokenUtil() + private OAuth2AuthenticationTokenExtractor() { } } From 016f045a4a57956d4caf527e2b2002bd0eff380b Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:23:22 +0200 Subject: [PATCH 52/58] Fix PMD --- .../xdev/sse/oauth2/filter/deauth/DefaultDeAuthApplier.java | 2 +- .../CookieBasedRememberRedirectOAuth2LoginProvider.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/filter/deauth/DefaultDeAuthApplier.java b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/filter/deauth/DefaultDeAuthApplier.java index 3234a853..dc61e2a2 100644 --- a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/filter/deauth/DefaultDeAuthApplier.java +++ b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/filter/deauth/DefaultDeAuthApplier.java @@ -52,7 +52,7 @@ public void deAuth(final ServletRequest request, final ServletResponse response, .map(ServletRequestAttributes.class::cast); if(optServletRequestAttributes.isPresent()) { - final ServletRequestAttributes servletRequestAttributes = optServletRequestAttributes.get(); + final ServletRequestAttributes servletRequestAttributes = optServletRequestAttributes.orElseThrow(); if(httpServletRequest == null) { httpServletRequest = servletRequestAttributes.getRequest(); diff --git a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/rememberloginproviderredirect/CookieBasedRememberRedirectOAuth2LoginProvider.java b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/rememberloginproviderredirect/CookieBasedRememberRedirectOAuth2LoginProvider.java index 1c2192fd..f6a6259f 100644 --- a/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/rememberloginproviderredirect/CookieBasedRememberRedirectOAuth2LoginProvider.java +++ b/oauth2-oidc/src/main/java/software/xdev/sse/oauth2/rememberloginproviderredirect/CookieBasedRememberRedirectOAuth2LoginProvider.java @@ -176,7 +176,7 @@ protected static class CookieBasedLoginUrlAuthenticationEntryPoint extends Login protected final CookieBasedRememberRedirectOAuth2LoginProvider parent; protected final Set loginUrls; - public CookieBasedLoginUrlAuthenticationEntryPoint( + protected CookieBasedLoginUrlAuthenticationEntryPoint( final String loginFormUrl, final CookieBasedRememberRedirectOAuth2LoginProvider parent, final Set loginUrls) @@ -251,7 +251,7 @@ protected static class CookieBasedDefaultRedirectStrategy extends DefaultRedirec { private final CookieBasedRememberRedirectOAuth2LoginProvider parent; - public CookieBasedDefaultRedirectStrategy(final CookieBasedRememberRedirectOAuth2LoginProvider parent) + protected CookieBasedDefaultRedirectStrategy(final CookieBasedRememberRedirectOAuth2LoginProvider parent) { this.parent = parent; } @@ -305,7 +305,7 @@ protected static class CookieLogoutHandler implements LogoutHandler { protected final CookieBasedRememberRedirectOAuth2LoginProvider parent; - public CookieLogoutHandler(final CookieBasedRememberRedirectOAuth2LoginProvider parent) + protected CookieLogoutHandler(final CookieBasedRememberRedirectOAuth2LoginProvider parent) { this.parent = parent; } From fc3f70b102dee649dfebada9112f4c8289242c53 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:24:57 +0200 Subject: [PATCH 53/58] Fix PMD II --- .../rememberme/OAuth2CookieRememberMeServices.java | 10 +++++----- ...aultOAuth2CookieRememberMeAuthSerializerTest.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java b/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java index 5e3fca83..b6112cc1 100644 --- a/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java +++ b/oauth2-oidc-remember-me/src/main/java/software/xdev/sse/oauth2/rememberme/OAuth2CookieRememberMeServices.java @@ -256,8 +256,8 @@ public Authentication autoLogin(final HttpServletRequest request, final HttpServ return null; } - final Cookie idCookie = optIdCookie.get(); - final Cookie payloadCookie = optPayloadCookie.get(); + final Cookie idCookie = optIdCookie.orElseThrow(); + final Cookie payloadCookie = optPayloadCookie.orElseThrow(); try { @@ -737,13 +737,13 @@ public O postProcess(final O object // Required for filtering correctly in provider protected static class RestoredOAuth2AuthenticationToken extends OAuth2AuthenticationToken { - public RestoredOAuth2AuthenticationToken(final OAuth2AuthenticationToken copyFrom) + protected RestoredOAuth2AuthenticationToken(final OAuth2AuthenticationToken copyFrom) { super(copyFrom.getPrincipal(), copyFrom.getAuthorities(), copyFrom.getAuthorizedClientRegistrationId()); this.setDetails(copyFrom.getDetails()); } - public RestoredOAuth2AuthenticationToken( + protected RestoredOAuth2AuthenticationToken( final OAuth2AuthenticationToken copyFrom, final OAuth2User enrichedUser) { @@ -755,7 +755,7 @@ public RestoredOAuth2AuthenticationToken( protected static class OAuth2CookieRememberMeAuthenticationProvider extends RememberMeAuthenticationProvider { - public OAuth2CookieRememberMeAuthenticationProvider() + protected OAuth2CookieRememberMeAuthenticationProvider() { super("X"); } diff --git a/oauth2-oidc-remember-me/src/test/java/software/xdev/sse/oauth2/rememberme/serializer/DefaultOAuth2CookieRememberMeAuthSerializerTest.java b/oauth2-oidc-remember-me/src/test/java/software/xdev/sse/oauth2/rememberme/serializer/DefaultOAuth2CookieRememberMeAuthSerializerTest.java index 9165de0b..0b124255 100644 --- a/oauth2-oidc-remember-me/src/test/java/software/xdev/sse/oauth2/rememberme/serializer/DefaultOAuth2CookieRememberMeAuthSerializerTest.java +++ b/oauth2-oidc-remember-me/src/test/java/software/xdev/sse/oauth2/rememberme/serializer/DefaultOAuth2CookieRememberMeAuthSerializerTest.java @@ -138,28 +138,28 @@ void performAttack( this.serializeAndDeserialize(serializer, data); } - public static class AttackPerformer + static class AttackPerformer { - public static final String SUCCESS_INDICATOR = "ATTACK_PERF_SUCCESS"; + static final String SUCCESS_INDICATOR = "ATTACK_PERF_SUCCESS"; private String id; // Required for Jackson - public AttackPerformer() + AttackPerformer() { } - public AttackPerformer(final String id) + AttackPerformer(final String id) { this.id = id; } - public String getId() + String getId() { return this.id; } - public void setId(final String id) + void setId(final String id) { this.id = id; From 27c1024e71a673f5e9f39bca3d12fed70018ce28 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 15:25:31 +0200 Subject: [PATCH 54/58] Bump version --- bom/pom.xml | 26 +++++++++---------- client-storage/pom.xml | 2 +- codec-sha256/pom.xml | 2 +- crypto-symmetric-managed/pom.xml | 2 +- crypto-symmetric/pom.xml | 2 +- csp/pom.xml | 2 +- demo/entities-metamodel/pom.xml | 2 +- demo/entities/pom.xml | 2 +- demo/integration-tests/pom.xml | 14 +++++----- demo/integration-tests/tci-db/pom.xml | 2 +- .../integration-tests/tci-webapp-rest/pom.xml | 2 +- .../tci-webapp-vaadin/pom.xml | 2 +- demo/integration-tests/tci-webapp/pom.xml | 2 +- demo/integration-tests/webapp-it-base/pom.xml | 2 +- demo/integration-tests/webapp-rest-it/pom.xml | 2 +- .../webapp-vaadin-it/pom.xml | 2 +- demo/persistence/pom.xml | 2 +- demo/pom.xml | 20 +++++++------- demo/webapp-rest/pom.xml | 2 +- demo/webapp-shared/pom.xml | 2 +- demo/webapp-vaadin/pom.xml | 2 +- metrics/pom.xml | 2 +- oauth2-oidc-remember-me/pom.xml | 2 +- oauth2-oidc/pom.xml | 2 +- pom.xml | 2 +- vaadin/pom.xml | 2 +- web-sidecar-actuator/pom.xml | 2 +- web-sidecar-common/pom.xml | 2 +- web/pom.xml | 2 +- 29 files changed, 56 insertions(+), 56 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index fc6a40ba..a3f65232 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse bom - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT pom bom @@ -51,62 +51,62 @@ software.xdev.sse client-storage - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse crypto-symmetric - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse crypto-symmetric-managed - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse codec-sha256 - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse csp - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse metrics - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse oauth2-oidc - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse oauth2-oidc-remember-me - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse vaadin - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse web - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse web-sidecar-actuator - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse web-sidecar-common - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/client-storage/pom.xml b/client-storage/pom.xml index 7012e385..3c37f38b 100644 --- a/client-storage/pom.xml +++ b/client-storage/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse client-storage - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar client-storage diff --git a/codec-sha256/pom.xml b/codec-sha256/pom.xml index bcaf9e24..dddd7469 100644 --- a/codec-sha256/pom.xml +++ b/codec-sha256/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse codec-sha256 - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar codec-sha256 diff --git a/crypto-symmetric-managed/pom.xml b/crypto-symmetric-managed/pom.xml index 904afe53..45aa6f54 100644 --- a/crypto-symmetric-managed/pom.xml +++ b/crypto-symmetric-managed/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse crypto-symmetric-managed - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar crypto-symmetric-managed diff --git a/crypto-symmetric/pom.xml b/crypto-symmetric/pom.xml index 6b8b1239..93d99073 100644 --- a/crypto-symmetric/pom.xml +++ b/crypto-symmetric/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse crypto-symmetric - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar crypto-symmetric diff --git a/csp/pom.xml b/csp/pom.xml index 9f098024..3b7114a4 100644 --- a/csp/pom.xml +++ b/csp/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse csp - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar csp diff --git a/demo/entities-metamodel/pom.xml b/demo/entities-metamodel/pom.xml index 8f310c55..ab9f96ed 100644 --- a/demo/entities-metamodel/pom.xml +++ b/demo/entities-metamodel/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT entities-metamodel diff --git a/demo/entities/pom.xml b/demo/entities/pom.xml index 958c722a..1b6bb821 100644 --- a/demo/entities/pom.xml +++ b/demo/entities/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT entities diff --git a/demo/integration-tests/pom.xml b/demo/integration-tests/pom.xml index 20fe59c8..4a80e33f 100644 --- a/demo/integration-tests/pom.xml +++ b/demo/integration-tests/pom.xml @@ -7,12 +7,12 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT pom @@ -31,31 +31,31 @@ software.xdev.sse.demo.it tci-db - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo.it tci-webapp - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo.it tci-webapp-rest - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo.it tci-webapp-vaadin - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo.it webapp-it-base - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/demo/integration-tests/tci-db/pom.xml b/demo/integration-tests/tci-db/pom.xml index 54e361e0..c5f58d1b 100644 --- a/demo/integration-tests/tci-db/pom.xml +++ b/demo/integration-tests/tci-db/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT tci-db diff --git a/demo/integration-tests/tci-webapp-rest/pom.xml b/demo/integration-tests/tci-webapp-rest/pom.xml index 077f7a83..15f3a2ca 100644 --- a/demo/integration-tests/tci-webapp-rest/pom.xml +++ b/demo/integration-tests/tci-webapp-rest/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT tci-webapp-rest diff --git a/demo/integration-tests/tci-webapp-vaadin/pom.xml b/demo/integration-tests/tci-webapp-vaadin/pom.xml index 5a6fe0cb..26fa57c6 100644 --- a/demo/integration-tests/tci-webapp-vaadin/pom.xml +++ b/demo/integration-tests/tci-webapp-vaadin/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT tci-webapp-vaadin diff --git a/demo/integration-tests/tci-webapp/pom.xml b/demo/integration-tests/tci-webapp/pom.xml index e3aad322..22b63eb6 100644 --- a/demo/integration-tests/tci-webapp/pom.xml +++ b/demo/integration-tests/tci-webapp/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT tci-webapp diff --git a/demo/integration-tests/webapp-it-base/pom.xml b/demo/integration-tests/webapp-it-base/pom.xml index bb0a051e..274ea224 100644 --- a/demo/integration-tests/webapp-it-base/pom.xml +++ b/demo/integration-tests/webapp-it-base/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-it-base diff --git a/demo/integration-tests/webapp-rest-it/pom.xml b/demo/integration-tests/webapp-rest-it/pom.xml index 22e29d9a..0f13494c 100644 --- a/demo/integration-tests/webapp-rest-it/pom.xml +++ b/demo/integration-tests/webapp-rest-it/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-rest-it diff --git a/demo/integration-tests/webapp-vaadin-it/pom.xml b/demo/integration-tests/webapp-vaadin-it/pom.xml index 8ae9f6da..51e69127 100644 --- a/demo/integration-tests/webapp-vaadin-it/pom.xml +++ b/demo/integration-tests/webapp-vaadin-it/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo.it integration-tests - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-vaadin-it diff --git a/demo/persistence/pom.xml b/demo/persistence/pom.xml index f1d00939..d71d57c0 100644 --- a/demo/persistence/pom.xml +++ b/demo/persistence/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT persistence diff --git a/demo/pom.xml b/demo/pom.xml index 1fdd7f49..1dea4d50 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT pom @@ -43,25 +43,25 @@ software.xdev.sse.demo entities - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo entities-metamodel - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo persistence - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse.demo webapp-shared - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT @@ -138,27 +138,27 @@ software.xdev.sse csp - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse oauth2-oidc - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse oauth2-oidc-remember-me - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse vaadin - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT software.xdev.sse web-sidecar-actuator - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT diff --git a/demo/webapp-rest/pom.xml b/demo/webapp-rest/pom.xml index 856fd7db..c1aa402c 100644 --- a/demo/webapp-rest/pom.xml +++ b/demo/webapp-rest/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-rest diff --git a/demo/webapp-shared/pom.xml b/demo/webapp-shared/pom.xml index 30955cee..57017ac4 100644 --- a/demo/webapp-shared/pom.xml +++ b/demo/webapp-shared/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-shared diff --git a/demo/webapp-vaadin/pom.xml b/demo/webapp-vaadin/pom.xml index e071fafc..0238a2e2 100644 --- a/demo/webapp-vaadin/pom.xml +++ b/demo/webapp-vaadin/pom.xml @@ -7,7 +7,7 @@ software.xdev.sse.demo demo - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT webapp-vaadin diff --git a/metrics/pom.xml b/metrics/pom.xml index 95d98a3d..c0f9198f 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse metrics - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar metrics diff --git a/oauth2-oidc-remember-me/pom.xml b/oauth2-oidc-remember-me/pom.xml index d8df9edf..ac3dcc88 100644 --- a/oauth2-oidc-remember-me/pom.xml +++ b/oauth2-oidc-remember-me/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse oauth2-oidc-remember-me - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar oauth2-oidc-remember-me diff --git a/oauth2-oidc/pom.xml b/oauth2-oidc/pom.xml index 312390de..bcd4dfd3 100644 --- a/oauth2-oidc/pom.xml +++ b/oauth2-oidc/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse oauth2-oidc - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar oauth2-oidc diff --git a/pom.xml b/pom.xml index 3bc7b8e9..4aa8b593 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse root - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT pom diff --git a/vaadin/pom.xml b/vaadin/pom.xml index 2e9ad744..d8c8745e 100644 --- a/vaadin/pom.xml +++ b/vaadin/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse vaadin - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar vaadin diff --git a/web-sidecar-actuator/pom.xml b/web-sidecar-actuator/pom.xml index fbc75237..3feaa179 100644 --- a/web-sidecar-actuator/pom.xml +++ b/web-sidecar-actuator/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse web-sidecar-actuator - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar web-sidecar-actuator diff --git a/web-sidecar-common/pom.xml b/web-sidecar-common/pom.xml index 3f0bf1a1..0cc367c5 100644 --- a/web-sidecar-common/pom.xml +++ b/web-sidecar-common/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse web-sidecar-common - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar web-sidecar-common diff --git a/web/pom.xml b/web/pom.xml index c479edba..7e8e2eb5 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ software.xdev.sse web - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT jar web From 072c51215b80e528748c2debf47209261188857d Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 16:01:39 +0200 Subject: [PATCH 55/58] Correctly log --- .../webapp/containers/WebAppContainer.java | 8 +++++++ .../xdev/sse/demo/rest/base/BaseTest.java | 4 +++- .../xdev/sse/demo/vaadin/base/BaseTest.java | 24 ++++++++++--------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/demo/integration-tests/tci-webapp/src/main/java/software/xdev/sse/demo/tci/webapp/containers/WebAppContainer.java b/demo/integration-tests/tci-webapp/src/main/java/software/xdev/sse/demo/tci/webapp/containers/WebAppContainer.java index 0579aac8..236cb9dd 100644 --- a/demo/integration-tests/tci-webapp/src/main/java/software/xdev/sse/demo/tci/webapp/containers/WebAppContainer.java +++ b/demo/integration-tests/tci-webapp/src/main/java/software/xdev/sse/demo/tci/webapp/containers/WebAppContainer.java @@ -27,6 +27,14 @@ protected WebAppContainer(final String dockerImageName, final boolean connection this.addExposedPort(DEFAULT_HTTP_PORT); } + public SELF withDebugRootLogger() + { + // Root logger level in Production = INFO and in dev-log = DEBUG + // -> Clashes and "random" log level is selected causing inconsistent behavior + // -> Set explicitly + return this.withEnv("LOGGING_LEVEL_ROOT", "debug"); + } + public SELF withDB(final String jdbcUrl, final String username, final String password) { return this.withEnv("SPRING_DATASOURCE_URL", jdbcUrl) diff --git a/demo/integration-tests/webapp-rest-it/src/test/java/software/xdev/sse/demo/rest/base/BaseTest.java b/demo/integration-tests/webapp-rest-it/src/test/java/software/xdev/sse/demo/rest/base/BaseTest.java index 17f0d6cf..a66c32eb 100644 --- a/demo/integration-tests/webapp-rest-it/src/test/java/software/xdev/sse/demo/rest/base/BaseTest.java +++ b/demo/integration-tests/webapp-rest-it/src/test/java/software/xdev/sse/demo/rest/base/BaseTest.java @@ -11,7 +11,9 @@ abstract class BaseTest extends AbstractBaseTest { protected static final RestWebAppTCIFactory APP_INFRA_FACTORY = - new RestWebAppTCIFactory(c -> c.withDB( + new RestWebAppTCIFactory(c -> c + .withDebugRootLogger() + .withDB( DBTCI.getInternalJDBCUrl(DNS_NAME_DB), DBTCI.DB_USERNAME, DBTCI.DB_PASSWORD diff --git a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/base/BaseTest.java b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/base/BaseTest.java index cc859c4d..7fe2dc35 100644 --- a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/base/BaseTest.java +++ b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/base/BaseTest.java @@ -20,17 +20,19 @@ @SuppressWarnings("java:S1117") abstract class BaseTest extends AbstractBaseTest { - protected static final Consumer - APP_CONTAINER_BUILDER = c -> c.withDB( - DBTCI.getInternalJDBCUrl(DNS_NAME_DB), - DBTCI.DB_USERNAME, - DBTCI.DB_PASSWORD - ) - .withAuth( - OIDCTCI.CLIENT_ID, - OIDCTCI.CLIENT_SECRET, - OIDCTCI.getInternalHttpBaseEndPoint(DNS_NAME_OIDC) - ); + protected static final Consumer APP_CONTAINER_BUILDER = + c -> c + .withDebugRootLogger() + .withDB( + DBTCI.getInternalJDBCUrl(DNS_NAME_DB), + DBTCI.DB_USERNAME, + DBTCI.DB_PASSWORD + ) + .withAuth( + OIDCTCI.CLIENT_ID, + OIDCTCI.CLIENT_SECRET, + OIDCTCI.getInternalHttpBaseEndPoint(DNS_NAME_OIDC) + ); protected static final VaadinWebAppPreStartableTCIFactory APP_INFRA_FACTORY = new VaadinWebAppPreStartableTCIFactory(APP_CONTAINER_BUILDER); From eef0eaa1756286c9d7693b9d21ce4ef52a94eef7 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 16:27:54 +0200 Subject: [PATCH 56/58] Try to fix test --- .../java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java index 3e242b0f..45fe42d0 100644 --- a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java +++ b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java @@ -60,6 +60,8 @@ void checkReLoginShouldKeepUrl(final TestBrowser browser) this.loginAndGotoMainSite(); this.navigateTo("another"); + this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another")); + // Delete all cookies of the CURRENT domain this.ensureAllCookiesDeleted(); this.getWebDriver().navigate().refresh(); From 0ea18ff144e366fea5d0053d9c244e5a8ffa64bd Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 16:37:42 +0200 Subject: [PATCH 57/58] Try fix test --- .../sse/demo/vaadin/cases/LoginOIDCTest.java | 33 ++++++++++++------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java index 45fe42d0..9741f6b4 100644 --- a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java +++ b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java @@ -57,18 +57,27 @@ void checkReLoginShouldKeepUrl(final TestBrowser browser) { this.startAll(browser, dbCtrl -> dbCtrl.useNewEntityManager(em -> new DefaultDG(em).generateAll())); - this.loginAndGotoMainSite(); - this.navigateTo("another"); - - this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another")); - - // Delete all cookies of the CURRENT domain - this.ensureAllCookiesDeleted(); - this.getWebDriver().navigate().refresh(); - - // Should be restored to the same path/view - Assertions.assertDoesNotThrow(() -> - this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another?continue"))); + // Race condition in chrome on low CPU machines where you land on /login?error + // Problem not reproducable locally or with Firefox + Unreliables.retryUntilSuccess( + browser == TestBrowser.CHROME ? 2 : 1, + () -> { + this.loginAndGotoMainSite(); + this.navigateTo("another"); + + this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another")); + + // Delete all cookies of the CURRENT domain + this.ensureAllCookiesDeleted(); + + this.getWebDriver().navigate().refresh(); + + // Should be restored to the same path/view + Assertions.assertDoesNotThrow(() -> + this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another?continue"))); + + return null; + }); } @DisplayName("Re-Login should not keep url if view does not exist") From 2dd932788317f536be254e63d859b388f15b2b47 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 1 Apr 2026 16:47:49 +0200 Subject: [PATCH 58/58] Revert "Try fix test" This reverts commit 0ea18ff144e366fea5d0053d9c244e5a8ffa64bd. --- .../sse/demo/vaadin/cases/LoginOIDCTest.java | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java index 9741f6b4..45fe42d0 100644 --- a/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java +++ b/demo/integration-tests/webapp-vaadin-it/src/test/java/software/xdev/sse/demo/vaadin/cases/LoginOIDCTest.java @@ -57,27 +57,18 @@ void checkReLoginShouldKeepUrl(final TestBrowser browser) { this.startAll(browser, dbCtrl -> dbCtrl.useNewEntityManager(em -> new DefaultDG(em).generateAll())); - // Race condition in chrome on low CPU machines where you land on /login?error - // Problem not reproducable locally or with Firefox - Unreliables.retryUntilSuccess( - browser == TestBrowser.CHROME ? 2 : 1, - () -> { - this.loginAndGotoMainSite(); - this.navigateTo("another"); - - this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another")); - - // Delete all cookies of the CURRENT domain - this.ensureAllCookiesDeleted(); - - this.getWebDriver().navigate().refresh(); - - // Should be restored to the same path/view - Assertions.assertDoesNotThrow(() -> - this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another?continue"))); - - return null; - }); + this.loginAndGotoMainSite(); + this.navigateTo("another"); + + this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another")); + + // Delete all cookies of the CURRENT domain + this.ensureAllCookiesDeleted(); + this.getWebDriver().navigate().refresh(); + + // Should be restored to the same path/view + Assertions.assertDoesNotThrow(() -> + this.waitUntil(ExpectedConditions.urlToBe(this.getWebAppBaseUrl() + "/another?continue"))); } @DisplayName("Re-Login should not keep url if view does not exist")