From 4a380b2069ab25bb8e80cf35643f48b5786b701d Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 28 Dec 2024 02:30:20 +0000 Subject: [PATCH 01/49] Update net.sourceforge.pmd to v7.9.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 eac619a1..68b0adbd 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.8.0 + 7.9.0 net.sourceforge.pmd pmd-java - 7.8.0 + 7.9.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 75f0b852..bf536758 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.8.0 + 7.9.0 net.sourceforge.pmd pmd-java - 7.8.0 + 7.9.0 From 5c0db241e0a8f72ea39ccbb3fc72bb588b6363e6 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sun, 29 Dec 2024 02:39:21 +0000 Subject: [PATCH 02/49] Update dependency com.puppycrawl.tools:checkstyle to v10.21.1 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index eac619a1..bff5bedd 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.0 + 10.21.1 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 75f0b852..850be814 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.0 + 10.21.1 From e495e977a0ab73077e1cb9f27b1af589191d848f Mon Sep 17 00:00:00 2001 From: JohannesRabauer Date: Fri, 10 Jan 2025 08:19:41 +0100 Subject: [PATCH 03/49] Update README.md --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6bba8866..06606447 100644 --- a/README.md +++ b/README.md @@ -105,12 +105,17 @@ client.id=abcd1234-ab12-ab12-ab12-abcdef123456 ### Configuration -The client can be configured through a properties file (see [app.properties](./bzst-dip-java-client-demo/src/main/resources/app.properties) and [ApplicationWithConfigurationFromProperties.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithConfigurationFromProperties.java)) or by creating a configuration object (see [Application.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/Application.java)). +The client can be configured through a properties file ( +see [app.properties](./bzst-dip-java-client-demo/src/main/resources/app.properties) +and [ApplicationWithConfigurationFromProperties.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithConfigurationFromProperties.java)) +or by creating a configuration object ( +see [ApplicationWithDac7.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithDac7.java)). ```java public static BzstDipConfiguration createConfiguration() { return new BzstDipConfigurationBuilder() + .setApplicationCode(BzstDipConfiguration.SupportedApplicationCode.DAC7) .setClientId("abcd1234-ab12-ab12-ab12-abcdef123456") .setTaxID("86095742719") .setTaxNumber("123") @@ -126,6 +131,12 @@ public static BzstDipConfiguration createConfiguration() } ``` +Messages are sent with +DAC7 ([ApplicationWithDac7.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithDac7.java)) or +the +CESOP ([ApplicationWithCesop.java](./bzst-dip-java-client-demo/src/main/java/software/xdev/ApplicationWithCesop.java)) +Format. + ## Support If you need support as soon as possible, and you can't wait for any pull request, feel free to use [our support](https://xdev.software/en/services/support). From 343f1548be7c46e0bb04dda00075efffaa6d5b5f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 13 Jan 2025 02:35:26 +0000 Subject: [PATCH 04/49] Update dependency com.opencsv:opencsv to v5.10 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 2dbea192..e9b4a28a 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -144,7 +144,7 @@ com.opencsv opencsv - 5.9 + 5.10 From c1635beae63b545bce9781ac37052c9605c2d8b0 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 21 Jan 2025 16:46:28 +0100 Subject: [PATCH 05/49] Support new GitHub issue types --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + .github/ISSUE_TEMPLATE/enhancement.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 68299d5d..a61d834c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,6 +1,7 @@ name: 🐞 Bug description: Create a bug report for something that is broken labels: [bug] +type: bug body: - type: markdown attributes: diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 75231293..764cae18 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -1,6 +1,7 @@ name: ✨ Feature/Enhancement description: Suggest a new feature or enhancement labels: [enhancement] +type: feature body: - type: markdown attributes: From 90d8e94bd7770da46707ffba981d11639b4e2358 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 21 Jan 2025 17:01:28 +0100 Subject: [PATCH 06/49] Overwrite gh-pages by default --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 236c0f59..43767e8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -169,6 +169,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site + force_orphan: true after-release: runs-on: ubuntu-latest From 50bc78e863a9f5a0d95293381d6683b92014a2d0 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 27 Jan 2025 02:32:12 +0000 Subject: [PATCH 07/49] Update dependency com.puppycrawl.tools:checkstyle to v10.21.2 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 26d67796..54d907b2 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.1 + 10.21.2 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index df945cfe..72b9e32a 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.1 + 10.21.2 From d109ab3c4f3340d813ab5eb82411d458c790a339 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 1 Feb 2025 04:13:58 +0000 Subject: [PATCH 08/49] Update dependency net.sourceforge.pmd:pmd-core to v7.10.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 54d907b2..9d7a55b9 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ net.sourceforge.pmd pmd-core - 7.9.0 + 7.10.0 net.sourceforge.pmd diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 72b9e32a..030c1c01 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,7 +284,7 @@ net.sourceforge.pmd pmd-core - 7.9.0 + 7.10.0 net.sourceforge.pmd From 459817dc44daa51a3ae4ae2d49de0158addc485c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 1 Feb 2025 04:14:00 +0000 Subject: [PATCH 09/49] Update dependency net.sourceforge.pmd:pmd-java to v7.10.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 54d907b2..049a943d 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ net.sourceforge.pmd pmd-java - 7.9.0 + 7.10.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 72b9e32a..eab82112 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -289,7 +289,7 @@ net.sourceforge.pmd pmd-java - 7.9.0 + 7.10.0 From febb98273d1ba9454ba3c79ab87668b4740ac51c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 22 Feb 2025 04:12:31 +0000 Subject: [PATCH 10/49] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.14.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 1af633cf..37022223 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.13.0 + 3.14.0 ${maven.compiler.release} diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d40730..02500422 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -132,7 +132,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.13.0 + 3.14.0 ${maven.compiler.release} From 0d53a9b152f4dc3d812f5c44e15ec26df45e98cc Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 24 Feb 2025 04:12:36 +0000 Subject: [PATCH 11/49] Update dependency com.puppycrawl.tools:checkstyle to v10.21.3 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c39fff2b..353d78db 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.2 + 10.21.3 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d40730..db2a2bff 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.2 + 10.21.3 From 15a053a764be7a91a2ab1d026bff2ca640401215 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 26 Feb 2025 04:14:11 +0000 Subject: [PATCH 12/49] Update dependency org.codehaus.mojo:flatten-maven-plugin to v1.7.0 --- template-placeholder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d40730..c6592b36 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -182,7 +182,7 @@ org.codehaus.mojo flatten-maven-plugin - 1.6.0 + 1.7.0 ossrh From eacac5add95c89cc33a8d571bae0bcbd5186c3a7 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 27 Feb 2025 04:13:15 +0000 Subject: [PATCH 13/49] Update dependency org.apache.maven.plugins:maven-project-info-reports-plugin to v3.9.0 --- template-placeholder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d40730..0784d8d6 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -95,7 +95,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.8.0 + 3.9.0 From a3c85c196e6f18d0f4d71a026136a6336df753fb Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 1 Mar 2025 04:13:31 +0000 Subject: [PATCH 14/49] Update net.sourceforge.pmd to v7.11.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 c39fff2b..aa2ba155 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.10.0 + 7.11.0 net.sourceforge.pmd pmd-java - 7.10.0 + 7.11.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 52d40730..44733c59 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.10.0 + 7.11.0 net.sourceforge.pmd pmd-java - 7.10.0 + 7.11.0 From 378beb5450ba1f6ab873b002e6c046e99cd22783 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 5 Mar 2025 04:13:28 +0000 Subject: [PATCH 15/49] Update dependency com.puppycrawl.tools:checkstyle to v10.21.4 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e8d4bbde..cc8c2819 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.3 + 10.21.4 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 11d38bdd..8bac89bb 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.3 + 10.21.4 From 0a57f91cbf92f2d695cc404000efe92f779372d6 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 13 Mar 2025 08:34:52 +0100 Subject: [PATCH 16/49] Use correct directory for PMD --- .github/workflows/check-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml index 08181168..3186173a 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -127,7 +127,4 @@ jobs: name: pmd-report if-no-files-found: ignore path: | - target/site/*.html - target/site/css/** - target/site/images/logos/maven-feather.png - target/site/images/external.png + target/reports/*.html From 188e420e46e5cdcdc418d3650617b36db663af91 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 13 Mar 2025 08:35:09 +0100 Subject: [PATCH 17/49] Use correct directory for PMD --- .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 3186173a..01edc3aa 100644 --- a/.github/workflows/check-build.yml +++ b/.github/workflows/check-build.yml @@ -127,4 +127,4 @@ jobs: name: pmd-report if-no-files-found: ignore path: | - target/reports/*.html + target/reports/** From 7d973058addb9bfd1c22f00b2b4a34e2405f267c Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:21:14 +0100 Subject: [PATCH 18/49] Naming --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43767e8e..d8754d6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,7 +121,7 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK Apache Maven Central + - name: Set up JDK OSSRH uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' @@ -132,7 +132,7 @@ jobs: gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to Apache Maven Central + - name: Publish to OSSRH run: ../mvnw -B deploy -Possrh -DskipTests env: MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} From 53829e02afaea2f1598094351417054c2a52bb91 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:23:36 +0100 Subject: [PATCH 19/49] Simplify module extraction --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d8754d6e..d014f7ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,7 +64,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" @@ -188,7 +188,7 @@ jobs: run: | mvnwPath=$(readlink -f ./mvnw) modules=("") # root - modules+=($(grep -ozP '(?<=module>)[^<]+' 'pom.xml' | tr -d '\0')) + modules+=($(grep -oP '(?<=)[^<]+' 'pom.xml')) for i in "${modules[@]}" do echo "Processing $i/pom.xml" From cf59a66878363d93c2e34dd6a46d4228f1e2eaeb Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 14 Mar 2025 14:29:58 +0100 Subject: [PATCH 20/49] Speed up check code --- .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 d014f7ba..655f7887 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: cache: 'maven' - name: Build with Maven - run: ./mvnw -B clean package + run: ./mvnw -B clean package -T2C - name: Check for uncommited changes run: | From bb022ad0cbbcbba74383f5c09550f21f1f547f8a Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 17 Mar 2025 10:14:58 +0100 Subject: [PATCH 21/49] Use SPDX identifier for license name https://maven.apache.org/pom.html#Licenses > Using an SPDX identifier as the license name is recommended Meanwhile https://maven.apache.org/xsd/maven-4.0.0.xsd > The full legal name of the license Can you maybe make up your mind? --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cc8c2819..f41e09d6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 8bac89bb..5544d7d5 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -35,7 +35,7 @@ - Apache License, Version 2.0 + Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo From da9442e969b44f01462120fd1557b37b25baa271 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 20 Mar 2025 16:03:11 +0000 Subject: [PATCH 22/49] Update dependency com.mycila:license-maven-plugin to v5 --- template-placeholder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 5544d7d5..db200048 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -103,7 +103,7 @@ com.mycila license-maven-plugin - 4.6 + 5.0.0 ${project.organization.url} From 2e7b1b6655563f8f81bdf02ce2c602c3a9be3946 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 21 Mar 2025 12:17:08 +0100 Subject: [PATCH 23/49] sonarcloud was renamed to sonarqubecloud --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 3ad8e88d..d9dbba57 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -200,7 +200,7 @@ jobs: GH_TOKEN: ${{ secrets.UPDATE_FROM_TEMPLATE_PAT }} run: | not_failed_conclusion="skipped|neutral|success" - not_relevant_app_slug="dependabot|github-pages|sonarcloud" + not_relevant_app_slug="dependabot|github-pages|sonarqubecloud" echo "Waiting for checks to start..." sleep 40s From 888b4ce0a3b28dcb11fdfec03d8912520d641c03 Mon Sep 17 00:00:00 2001 From: AB Date: Fri, 21 Mar 2025 12:39:41 +0100 Subject: [PATCH 24/49] Fix branch deletion being not detected --- .github/workflows/update-from-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index d9dbba57..24af3f35 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -210,7 +210,7 @@ jobs: echo "Checking if update-branch-merged exists" git fetch - if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then + 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" From c021044d61db78e1988715ecd6abde9b88f70c67 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 26 Mar 2025 15:49:45 +0100 Subject: [PATCH 25/49] Pin unofficial actions versions https://github.com/xdev-software/base-template/issues/1 --- .github/workflows/broken-links.yml | 4 ++-- .github/workflows/sync-labels.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 48265e89..2b1188ec 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@v2 + uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # v2 with: fail: false # Don't fail on broken links, create an issue instead @@ -37,7 +37,7 @@ jobs: - name: Create Issue From File if: env.lychee_exit_code != 0 - uses: peter-evans/create-issue-from-file@v5 + uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5 with: issue-number: ${{ steps.find-issue.outputs.number }} title: Link Checker Report diff --git a/.github/workflows/sync-labels.yml b/.github/workflows/sync-labels.yml index ff880f07..0e2beb51 100644 --- a/.github/workflows/sync-labels.yml +++ b/.github/workflows/sync-labels.yml @@ -19,6 +19,6 @@ jobs: with: sparse-checkout: .github/labels.yml - - uses: EndBug/label-sync@v2 + - uses: EndBug/label-sync@52074158190acb45f3077f9099fea818aa43f97a # v2 with: config-file: .github/labels.yml From 581b7fb0faa1eb3b591501b251cb733b4d12c6c0 Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 26 Mar 2025 16:22:13 +0100 Subject: [PATCH 26/49] Pin unofficial actions versions https://github.com/xdev-software/base-template/issues/1 --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 655f7887..8bd0f3c2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,7 +89,7 @@ jobs: - name: Create Release id: create_release - uses: shogo82148/actions-create-release@v1 + uses: shogo82148/actions-create-release@e5f206451d4ace2da9916d01f1aef279997f8659 # v1 with: tag_name: v${{ steps.version.outputs.release }} release_name: v${{ steps.version.outputs.release }} @@ -165,7 +165,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Deploy to Github pages - uses: peaceiris/actions-gh-pages@v4 + uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4 with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./${{ env.PRIMARY_MAVEN_MODULE }}/target/site From 5ced1cc41f894e26af310f1722dcd94e68af5b9e Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 29 Mar 2025 04:13:09 +0000 Subject: [PATCH 27/49] Update net.sourceforge.pmd to v7.12.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 f41e09d6..07c70bad 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.11.0 + 7.12.0 net.sourceforge.pmd pmd-java - 7.11.0 + 7.12.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index db200048..47dd4d83 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.11.0 + 7.12.0 net.sourceforge.pmd pmd-java - 7.11.0 + 7.12.0 From 49db248d25fd4a3106ddaaf092c86a205d357c4c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 31 Mar 2025 04:15:29 +0000 Subject: [PATCH 28/49] Update dependency com.puppycrawl.tools:checkstyle to v10.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 f41e09d6..eb66486e 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.21.4 + 10.22.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index db200048..014b6081 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.21.4 + 10.22.0 From 4eef9ec75c98fcddb0845dfe527b5ae6615db1c3 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 31 Mar 2025 08:37:19 +0200 Subject: [PATCH 29/49] Improve Code Analysis See https://github.com/xdev-software/java-template/issues/13 --- .config/checkstyle/checkstyle.xml | 13 +++++++++- .config/pmd/ruleset.xml | 43 ++++++++++++++++++++++++++++--- 2 files changed, 51 insertions(+), 5 deletions(-) diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index a0d7f178..43b52907 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -52,6 +52,7 @@ + @@ -68,6 +69,11 @@ + + + + + @@ -93,7 +99,6 @@ - @@ -122,7 +127,13 @@ + + + + + + diff --git a/.config/pmd/ruleset.xml b/.config/pmd/ruleset.xml index 7a03f17c..88a7b5ae 100644 --- a/.config/pmd/ruleset.xml +++ b/.config/pmd/ruleset.xml @@ -10,16 +10,38 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -76,9 +98,6 @@ - - - @@ -114,17 +133,33 @@ + + + + + + + + + + + + + + + + - + From e5152dc2243ec5b88ef9d45e6a836ebf10c9aece Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 1 Apr 2025 04:11:14 +0000 Subject: [PATCH 30/49] Update lycheeverse/lychee-action digest to 1d97d84 --- .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 2b1188ec..ade03464 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@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # v2 + uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 with: fail: false # Don't fail on broken links, create an issue instead From 4ff7c848a6a29ba54bb1982f5237e16ac325d298 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 3 Apr 2025 04:13:57 +0000 Subject: [PATCH 31/49] Update dependency com.puppycrawl.tools:checkstyle to v10.23.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 c46fefe0..6d58c9da 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.22.0 + 10.23.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 5dcf34d4..71700cc3 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.22.0 + 10.23.0 From 66d8e0bfe26483647ff25b5b4a6cf27e3aae9211 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 12 Apr 2025 04:10:21 +0000 Subject: [PATCH 32/49] Update junit-jupiter.version to v5.12.2 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index e9b4a28a..46f5635e 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -57,7 +57,7 @@ src/generated/** - 5.11.4 + 5.12.2 From 9f5cab50cee12ff7b938c164170d8d064f07be5a Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Apr 2025 08:39:58 +0200 Subject: [PATCH 33/49] Enforce IDEA plugins --- .idea/externalDependencies.xml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .idea/externalDependencies.xml diff --git a/.idea/externalDependencies.xml b/.idea/externalDependencies.xml new file mode 100644 index 00000000..78be5b8e --- /dev/null +++ b/.idea/externalDependencies.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file From 855c40a960bb2b60cd0e58a5d4339ab0bf4d6fbd Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 26 Apr 2025 04:15:56 +0000 Subject: [PATCH 34/49] Update net.sourceforge.pmd to v7.13.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 6d58c9da..6e8b462c 100644 --- a/pom.xml +++ b/pom.xml @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 71700cc3..e1b29d2d 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -284,12 +284,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0 From 7c3c850c225fdac6dadff0b541e6f32944f0b9fd Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 28 Apr 2025 04:16:13 +0000 Subject: [PATCH 35/49] Update dependency com.puppycrawl.tools:checkstyle to v10.23.1 --- pom.xml | 2 +- template-placeholder/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6d58c9da..79539b23 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 71700cc3..350e7112 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -247,7 +247,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 From 25dd0edc236a5305346fd2f2e64c8f058e114b6f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:10:09 +0000 Subject: [PATCH 36/49] Update lycheeverse/lychee-action digest to 82202e5 --- .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 ade03464..0d8c9606 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@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead From 22946ad08ebadf5f4196a9512ab7055d6f95431c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:12:33 +0000 Subject: [PATCH 37/49] Update lycheeverse/lychee-action digest to 82202e5 --- .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 32f412fa..16a3f376 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@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2 + uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2 with: fail: false # Don't fail on broken links, create an issue instead From fbe507552f252da256039df70cb98c01b334e70a Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:37:10 +0200 Subject: [PATCH 38/49] Fix rename I --- bzst-dip-java-client/pom.xml | 596 ----------------------------------- 1 file changed, 596 deletions(-) delete mode 100644 bzst-dip-java-client/pom.xml diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml deleted file mode 100644 index 46f5635e..00000000 --- a/bzst-dip-java-client/pom.xml +++ /dev/null @@ -1,596 +0,0 @@ - - - 4.0.0 - - software.xdev - bzst-dip-java-client - 2.0.1-SNAPSHOT - jar - - bzst-dip-java-client - bzst-dip-java-client - https://github.com/xdev-software/bzst-dip-java-client - - - https://github.com/xdev-software/bzst-dip-java-client - scm:git:https://github.com/xdev-software/bzst-dip-java-client.git - - - 2024 - - - XDEV Software - https://xdev.software - - - - - XDEV Software - XDEV Software - https://xdev.software - - - - - - Apache License, Version 2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - 17 - ${javaVersion} - - UTF-8 - UTF-8 - - 0.12.6 - 2.18.2 - - src/generated/java - - - - src/generated/** - - 5.12.2 - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - commons-io - commons-io - 2.18.0 - - - jakarta.xml.bind - jakarta.xml.bind-api - 4.0.2 - - - com.sun.xml.bind - jaxb-impl - 4.0.5 - - - io.jsonwebtoken - jjwt-api - ${jjwt.version} - - - io.jsonwebtoken - jjwt-impl - ${jjwt.version} - runtime - - - io.jsonwebtoken - jjwt-jackson - ${jjwt.version} - runtime - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - - - com.fasterxml.jackson.core - jackson-annotations - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - ${jackson.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - - - - org.apache.httpcomponents.client5 - httpclient5 - 5.4.1 - - - org.openapitools - jackson-databind-nullable - 0.2.6 - - - org.slf4j - slf4j-api - 2.0.16 - - - com.opencsv - opencsv - 5.10 - - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit-jupiter.version} - test - - - org.apache.logging.log4j - log4j-slf4j2-impl - 2.24.3 - test - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - - - org.apache.maven.plugins - maven-site-plugin - 4.0.0-M16 - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 3.8.0 - - - - - - com.mycila - license-maven-plugin - 4.6 - - - ${project.organization.url} - - - -
com/mycila/maven/plugin/license/templates/APACHE-2.txt
- - src/main/java/** - src/test/java/** - - - - - - - first - - format - - process-sources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - ${maven.compiler.release} - - -proc:none - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.11.2 - - - attach-javadocs - package - - jar - - - - - true - none - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - package - - jar-no-fork - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.6.0 - - - generate-sources - - add-source - - - - ${generatedDirRelative} - - - - - - - - - - ossrh - - - - org.codehaus.mojo - flatten-maven-plugin - 1.6.0 - - ossrh - - - - flatten - process-resources - - flatten - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.7 - - - sign-artifacts - verify - - sign - - - - - - --pinentry-mode - loopback - - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 - true - - ossrh - https://s01.oss.sonatype.org/ - - 30 - true - - - - - - - checkstyle - - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.6.0 - - - com.puppycrawl.tools - checkstyle - 10.21.1 - - - - ../.config/checkstyle/checkstyle.xml - true - **/xmldocument/model/**/* - - - - - check - - - - - - - - - openapi-generator - - bzst/dip/client/generated - bzst.dip.client.generated - - ${project.basedir}/${generatedDirRelative} - src/gen - - ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} - - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.4.0 - - - pre-generation-clean - initialize - - clean - - - true - - - ${generatedDir} - - - - - - post-generation-clean - process-resources - - clean - - - - - - org.openapitools - openapi-generator-maven-plugin - 7.10.0 - - - - generate - - - ${project.basedir}/../openapi/openapi.yml - java - - ${openApiRelativeGeneratorDir} - apache-httpclient - software.xdev.${componentPackage}.api - software.xdev.${componentPackage}.model - software.xdev.${componentPackage}.client - - true - - false - - - true - true - - - false - false - false - false - - - - - - org.apache.maven.plugins - maven-resources-plugin - 3.3.1 - - - copy-generated-resources - process-sources - - copy-resources - - - ${generatedDir} - - - ${openApiGeneratorDir} - - - - - - - - software.xdev - find-and-replace-maven-plugin - 1.0.3 - - - - remove-unused-import-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider - process-sources - - file-contents - - - ${generatedDirRelative}/software/xdev/${componentDir}/client/ - ApiClient.java - - ^import com\.fasterxml\.jackson\.jaxrs\.json\.JacksonJsonProvider;(\r?\n) - - false - - - - - remove-generated-annotation - process-sources - - file-contents - - - ${generatedDirRelative}/software/xdev/${componentDir}/ - true - .java - ^@jakarta\.annotation\.Generated.*(\r?\n) - false - false - - - - - remove-serialVersionUID - process-sources - - file-contents - - - ${generatedDirRelative}/software/xdev/${componentDir}/ - true - .java - ^.*serialVersionUID.*(\r?\n)(\s*\r?\n)? - false - false - - - - - - - - - pmd - - - - maven-pmd-plugin - 3.26.0 - - true - true - - ../.config/pmd/ruleset.xml - - - **/generated/**/*.java - - - - - net.sourceforge.pmd - pmd-core - 7.9.0 - - - net.sourceforge.pmd - pmd-java - 7.9.0 - - - - - - - - - - org.apache.maven.plugins - maven-jxr-plugin - 3.6.0 - - - - - - From 69036bcdb5177ed89c848c9489247ddb91232e42 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:37:19 +0200 Subject: [PATCH 39/49] Fix rename II --- {template-placeholder => bzst-dip-java-client}/pom.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {template-placeholder => bzst-dip-java-client}/pom.xml (100%) diff --git a/template-placeholder/pom.xml b/bzst-dip-java-client/pom.xml similarity index 100% rename from template-placeholder/pom.xml rename to bzst-dip-java-client/pom.xml From 6f42239127fd444e97a26690daf81c8453836e35 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:38:52 +0200 Subject: [PATCH 40/49] Fix rename III --- bzst-dip-java-client/pom.xml | 302 ++++++++++++++++++++++++++++++++++- 1 file changed, 294 insertions(+), 8 deletions(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 19b3fce8..c228094a 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -5,17 +5,17 @@ 4.0.0 software.xdev - template-placeholder - 1.0.0-SNAPSHOT + bzst-dip-java-client + 2.0.1-SNAPSHOT jar - template-placeholder - template-placeholder - https://github.com/xdev-software/template-placeholder + bzst-dip-java-client + bzst-dip-java-client + https://github.com/xdev-software/bzst-dip-java-client - https://github.com/xdev-software/template-placeholder - scm:git:https://github.com/xdev-software/template-placeholder.git + https://github.com/xdev-software/bzst-dip-java-client + scm:git:https://github.com/xdev-software/bzst-dip-java-client.git 2023 @@ -47,6 +47,17 @@ UTF-8 UTF-8 + + 0.12.6 + 2.18.2 + + src/generated/java + + + + src/generated/** + + 5.12.2 @@ -61,6 +72,101 @@ + + + commons-io + commons-io + 2.18.0 + + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + com.sun.xml.bind + jaxb-impl + 4.0.5 + + + io.jsonwebtoken + jjwt-api + ${jjwt.version} + + + io.jsonwebtoken + jjwt-impl + ${jjwt.version} + runtime + + + io.jsonwebtoken + jjwt-jackson + ${jjwt.version} + runtime + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + org.apache.httpcomponents.client5 + httpclient5 + 5.4.1 + + + org.openapitools + jackson-databind-nullable + 0.2.6 + + + org.slf4j + slf4j-api + 2.0.16 + + + com.opencsv + opencsv + 5.10 + + + + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit-jupiter.version} + test + + + org.apache.logging.log4j + log4j-slf4j2-impl + 2.24.3 + test + + + @@ -172,6 +278,24 @@ + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.0 + + + generate-sources + + add-source + + + + ${generatedDirRelative} + + + + + @@ -253,6 +377,7 @@ ../.config/checkstyle/checkstyle.xml true + **/xmldocument/model/**/* @@ -266,11 +391,169 @@ - pmd + openapi-generator + + bzst/dip/client/generated + bzst.dip.client.generated + + ${project.basedir}/${generatedDirRelative} + src/gen + + ${project.basedir}/target/generated-sources/openapi/${openApiRelativeGeneratorDir} + + org.apache.maven.plugins + maven-clean-plugin + 3.4.0 + + + pre-generation-clean + initialize + + clean + + + true + + + ${generatedDir} + + + + + + post-generation-clean + process-resources + + clean + + + + + + org.openapitools + openapi-generator-maven-plugin + 7.10.0 + + + + generate + + + ${project.basedir}/../openapi/openapi.yml + java + + ${openApiRelativeGeneratorDir} + apache-httpclient + software.xdev.${componentPackage}.api + software.xdev.${componentPackage}.model + software.xdev.${componentPackage}.client + + true + + false + + + true + true + + + false + false + false + false + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-generated-resources + process-sources + + copy-resources + + + ${generatedDir} + + + ${openApiGeneratorDir} + + + + + + + + software.xdev + find-and-replace-maven-plugin + 1.0.3 + + + + remove-unused-import-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider + process-sources + + file-contents + + + ${generatedDirRelative}/software/xdev/${componentDir}/client/ + ApiClient.java + + ^import com\.fasterxml\.jackson\.jaxrs\.json\.JacksonJsonProvider;(\r?\n) + + false + + + + + remove-generated-annotation + process-sources + + file-contents + + + ${generatedDirRelative}/software/xdev/${componentDir}/ + true + .java + ^@jakarta\.annotation\.Generated.*(\r?\n) + false + false + + + + + remove-serialVersionUID + process-sources + + file-contents + + + ${generatedDirRelative}/software/xdev/${componentDir}/ + true + .java + ^.*serialVersionUID.*(\r?\n)(\s*\r?\n)? + false + false + + + + + + + + + pmd + + + maven-pmd-plugin 3.26.0 @@ -279,6 +562,9 @@ ../.config/pmd/ruleset.xml + + **/generated/**/*.java + From f1bc31cffbfda463f60b1bf226901bca39641c86 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:40:27 +0000 Subject: [PATCH 41/49] Update dependency org.apache.maven.plugins:maven-clean-plugin to v3.4.1 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index c228094a..e2b5452c 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -407,7 +407,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.4.1 pre-generation-clean From 849a98e976acd7d71c03ed03634b17d89c98e036 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:40:33 +0000 Subject: [PATCH 42/49] Update jackson.version to v2.19.0 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index c228094a..715759d7 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -49,7 +49,7 @@ UTF-8 0.12.6 - 2.18.2 + 2.19.0 src/generated/java From 04f7a7d28761ff6310e1038d724247d5fb5d4a70 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:40:34 +0200 Subject: [PATCH 43/49] Use correct year --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index c228094a..ed18786d 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -18,7 +18,7 @@ scm:git:https://github.com/xdev-software/bzst-dip-java-client.git - 2023 + 2024 XDEV Software From 228de2609c7b3d228b0641151f608a619062e32a Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:42:32 +0000 Subject: [PATCH 44/49] Update dependency org.apache.httpcomponents.client5:httpclient5 to v5.4.3 [SECURITY] --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 27c2acfe..b987ae24 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -129,7 +129,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.4.1 + 5.4.3 org.openapitools From d17a029f43f7c91eeefde0b18926a0190d293d2f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:42:34 +0000 Subject: [PATCH 45/49] Update dependency org.slf4j:slf4j-api to v2.0.17 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 27c2acfe..80d8b0ee 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -139,7 +139,7 @@ org.slf4j slf4j-api - 2.0.16 + 2.0.17 com.opencsv From e1b4149275c1b8dddb284bde7b11660da587754c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:42:35 +0000 Subject: [PATCH 46/49] Update dependency com.opencsv:opencsv to v5.11 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 27c2acfe..12646ba9 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -144,7 +144,7 @@ com.opencsv opencsv - 5.10 + 5.11 From fee64af50e5535cb5c884a63ca1f6c8d726de74d Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 12:42:37 +0000 Subject: [PATCH 47/49] Update dependency commons-io:commons-io to v2.19.0 --- bzst-dip-java-client/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bzst-dip-java-client/pom.xml b/bzst-dip-java-client/pom.xml index 27c2acfe..ccb2fe23 100644 --- a/bzst-dip-java-client/pom.xml +++ b/bzst-dip-java-client/pom.xml @@ -76,7 +76,7 @@ commons-io commons-io - 2.18.0 + 2.19.0 jakarta.xml.bind From 3120940ba8bda65bf8c1718950ed5c3d75843007 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:48:54 +0200 Subject: [PATCH 48/49] Fix/Suppress PMD Related: #14 --- .../xdev/bzst/dip/client/exception/TaxNumberException.java | 2 +- .../software/xdev/bzst/dip/client/util/WebClientUtil.java | 3 --- .../software/xdev/bzst/dip/client/webclient/WebClient.java | 2 -- .../bzst/dip/client/xmldocument/ReportableSellerCreator.java | 2 +- .../bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java | 1 + .../bzst/dip/client/signing/SigningProviderByJksTest.java | 4 ++-- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/exception/TaxNumberException.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/exception/TaxNumberException.java index 5100ea7b..048d5278 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/exception/TaxNumberException.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/exception/TaxNumberException.java @@ -23,6 +23,6 @@ public class TaxNumberException extends ConfigurationException { public TaxNumberException(final String taxNumber) { - super("The taxnumber (Steueridentifikationsnummer) is not valid!"); + super("The taxnumber (Steueridentifikationsnummer) '" + taxNumber + "' is not valid!"); } } diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/util/WebClientUtil.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/util/WebClientUtil.java index ac4e4136..4442fad6 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/util/WebClientUtil.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/util/WebClientUtil.java @@ -24,8 +24,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -41,7 +39,6 @@ */ public final class WebClientUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(WebClientUtil.class); public static final String TAG_NAME_DATENTRANSFERNUMMER = "Datentransfernummer"; private WebClientUtil() diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java index 8eb0f38b..e79217ec 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/webclient/WebClient.java @@ -141,8 +141,6 @@ public BzstDipSingleTransferResult requestTransferResult(final String dataTransf ) ) { - final String text = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); - // TODO: Check text return new BzstDipSingleTransferResult(dataTransferNumber, 2); diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/ReportableSellerCreator.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/ReportableSellerCreator.java index 2c89103a..ccec4e15 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/ReportableSellerCreator.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/ReportableSellerCreator.java @@ -338,7 +338,7 @@ private static OrganisationPartyType createOrganisationPartyType( */ public static boolean isNULLAsString(final String checkNULLString) { - return checkNULLString.equals(NULL_STRING); + return NULL_STRING.equals(checkNULLString); } private static OrganisationINType createIN(final String in) diff --git a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java index e8a01b27..e7a9ff03 100644 --- a/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java +++ b/bzst-dip-java-client/src/main/java/software/xdev/bzst/dip/client/xmldocument/XMLDocumentBodyCreator.java @@ -133,6 +133,7 @@ private Object createData( return dataType; } + @SuppressWarnings("PMD.UnusedFormalParameter") // TODO Needs to be resolved! private Object createData( final PaymentDataBodyType paymentDataBodyType) throws DatatypeConfigurationException { diff --git a/bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/signing/SigningProviderByJksTest.java b/bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/signing/SigningProviderByJksTest.java index 052ef9a3..b6fece38 100644 --- a/bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/signing/SigningProviderByJksTest.java +++ b/bzst-dip-java-client/src/test/java/software/xdev/bzst/dip/client/signing/SigningProviderByJksTest.java @@ -56,7 +56,7 @@ void getPrivateKeyWrongPassword() ); Assertions.assertThrows( SigningException.class, - () -> signingProviderByJks.getPrivateKey() + signingProviderByJks::getPrivateKey ); } @@ -69,7 +69,7 @@ void getCertificateWrongPassword() ); Assertions.assertThrows( SigningException.class, - () -> signingProviderByJks.getCertificate() + signingProviderByJks::getCertificate ); } } From b1582ac64579b16d0859b488eef0d19b8cc6653e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 15 May 2025 14:56:26 +0200 Subject: [PATCH 49/49] Update CHANGELOG.md --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b67a05e..d6a492b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,16 @@ -# 2.0.0 +# 2.0.1 +* Updated dependencies + * Including ``org.apache.httpcomponents.client5:httpclient5`` to ``5.4.3`` due to CVE-2025-27820 +# 2.0.0 * Now supports the CESOP-Format (and the DAC7-Format). * Uses a client that is auto generated by OpenAPI. This makes the library more robust for future changes of the API. * Certificates can now be defined with a ``SigningProvider``. # 1.0.3 - * ReportableSellerCreator can now create "Rechtsträger" like a company. # 1.0.2 - * The alias for the private key in the keystore is now configurable ( Properties: `certificate.keystore.private.key.alias` or Code: `BzstDipConfigurationBuilder#setKeyStorePrivateKeyAlias`)