From 48f0a23f572b8212cd604f9b85f3adf33a1d8ef5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 00:35:52 +0000 Subject: [PATCH 01/51] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.5.0 to 3.6.0 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.5.0...maven-javadoc-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 9f74dbf..9176612 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 attach-javadocs From e3d030b462ad4c2a7580c1e10c21047af856ee56 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:25:55 +0000 Subject: [PATCH 02/51] Bump vaadin.version from 24.1.9 to 24.1.10 Bumps `vaadin.version` from 24.1.9 to 24.1.10. Updates `com.vaadin:vaadin-bom` from 24.1.9 to 24.1.10 Updates `com.vaadin:vaadin-maven-plugin` from 24.1.9 to 24.1.10 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index d7dd1c5..98786c2 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.1.9 + 24.1.10 3.1.3 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index c690e4c..3b9b2be 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.1.9 + 24.1.10 From ff31e069ea8b6aa1cf333e5514b35829ca15f0f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:26:47 +0000 Subject: [PATCH 03/51] Bump org.springframework.boot.version from 3.1.3 to 3.1.4 Bumps `org.springframework.boot.version` from 3.1.3 to 3.1.4. Updates `org.springframework.boot:spring-boot-dependencies` from 3.1.3 to 3.1.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.3...v3.1.4) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.1.3 to 3.1.4 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index d7dd1c5..ec0b370 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -28,7 +28,7 @@ 24.1.9 - 3.1.3 + 3.1.4 From c2ca04b205c0bb380fa66d19565da6e4b7da88de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Sep 2023 01:06:57 +0000 Subject: [PATCH 04/51] Bump com.mycila:license-maven-plugin from 4.2 to 4.3 Bumps com.mycila:license-maven-plugin from 4.2 to 4.3. --- updated-dependencies: - dependency-name: com.mycila:license-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 9f74dbf..349bfc7 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -89,7 +89,7 @@ com.mycila license-maven-plugin - 4.2 + 4.3 ${project.organization.url} From 8980688df58baa1717d5326f56e58d9a28a0546e Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:46:22 +0200 Subject: [PATCH 05/51] Update update-from-template.yml --- .github/workflows/update-from-template.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index ab0b49e..2b41fdd 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -81,12 +81,14 @@ jobs: echo "abort=0" >> $GITHUB_OUTPUT - name: pull-request - uses: repo-sync/pull-request@v2 if: steps.main.outputs.abort == 0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - source_branch: ${{ env.UPDATE_BRANCH }} - destination_branch: ${{ steps.main.outputs.current_branch }} - pr_title: "Update from template" - pr_body: "An automated PR to sync changes from the template into this repo" - + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ + -H "${{ env.UPDATE_BRANCH }}" \ + --title "Update from template" \ + --body "An automated PR to sync changes from the template into this repo" From cfc09139877497ff163fd490910467131c614a1b Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 2 Oct 2023 12:55:20 +0200 Subject: [PATCH 06/51] Replace outdated repo-sync/pull-request --- .github/workflows/release.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 53d1c12..b2ae4d2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,9 +223,12 @@ jobs: git push origin - name: pull-request - uses: repo-sync/pull-request@v2 - with: - destination_branch: "develop" - pr_title: "Sync back" - pr_body: "An automated PR to sync changes back" - + env: + GH_TOKEN: ${{ github.token }} + run: | + gh_pr_up() { + gh pr create "$@" || gh pr edit "$@" + } + gh_pr_up -B "develop" \ + --title "Sync back" \ + --body "An automated PR to sync changes back" From 306805cf1924ecad5dd7a4aecdaab8d7f36c8537 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:00:03 +0000 Subject: [PATCH 07/51] Bump vaadin.version from 24.1.10 to 24.1.11 Bumps `vaadin.version` from 24.1.10 to 24.1.11. Updates `com.vaadin:vaadin-bom` from 24.1.10 to 24.1.11 Updates `com.vaadin:vaadin-maven-plugin` from 24.1.10 to 24.1.11 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 2f91798..8b98227 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.1.10 + 24.1.11 3.1.4 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index f61a90c..8a1f942 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.1.10 + 24.1.11 From 0699efb658cb96454736fcc7a0fe6a3161879e74 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 2 Oct 2023 17:13:13 +0200 Subject: [PATCH 08/51] Replace GIF with AVIF https://imgflip.com/i/815w5x --- assets/demo.avif | Bin 0 -> 1430 bytes assets/demo.gif | Bin 14257 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/demo.avif delete mode 100644 assets/demo.gif diff --git a/assets/demo.avif b/assets/demo.avif new file mode 100644 index 0000000000000000000000000000000000000000..c12da7e63319fc581b0d3d4ca3c5b2cc34cf0c75 GIT binary patch literal 1430 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 From e545e02ff79ee29fc3b91ff9fff4b0ea347fa967 Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 2 Oct 2023 17:26:49 +0200 Subject: [PATCH 09/51] Replace gif with avif also in Readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea5f854..fae4297 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ A Vaadin Template Repo
Show example - ![demo](assets/demo.gif) + ![demo](assets/demo.avif)
## Support From 7273c89289a699cf0365db8644d7d0bb9bb4364a Mon Sep 17 00:00:00 2001 From: AB Date: Wed, 4 Oct 2023 09:45:53 +0200 Subject: [PATCH 10/51] Create demo.avif --- assets/demo.avif | Bin 0 -> 54652 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 assets/demo.avif diff --git a/assets/demo.avif b/assets/demo.avif new file mode 100644 index 0000000000000000000000000000000000000000..89942c142b9abf2df95a72a818826d9764d0b453 GIT binary patch literal 54652 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 U_)gImQ5Q7*YS$S64`Z4E079yiRsaA1 literal 0 HcmV?d00001 From 472f94733122a55c8364e2e708fa0b0fe7a5ab5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 00:39:00 +0000 Subject: [PATCH 11/51] Bump vaadin.version from 24.1.11 to 24.1.12 Bumps `vaadin.version` from 24.1.11 to 24.1.12. Updates `com.vaadin:vaadin-bom` from 24.1.11 to 24.1.12 Updates `com.vaadin:vaadin-maven-plugin` from 24.1.11 to 24.1.12 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 8b98227..5a836f0 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.1.11 + 24.1.12 3.1.4 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 8a1f942..1757485 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.1.11 + 24.1.12 From 87f837a6d3915cda6ef735abb81b84855bd47bfe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 00:36:42 +0000 Subject: [PATCH 12/51] Bump vaadin.version from 24.1.12 to 24.2.0 Bumps `vaadin.version` from 24.1.12 to 24.2.0. Updates `com.vaadin:vaadin-bom` from 24.1.12 to 24.2.0 Updates `com.vaadin:vaadin-maven-plugin` from 24.1.12 to 24.2.0 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 5a836f0..485e2b1 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.1.12 + 24.2.0 3.1.4 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 1757485..6d0d7e7 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.1.12 + 24.2.0 From 6b67652a27bdc55280024cc2a7a506f571ea778e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 00:10:40 +0000 Subject: [PATCH 13/51] Bump org.springframework.boot.version from 3.1.4 to 3.1.5 Bumps `org.springframework.boot.version` from 3.1.4 to 3.1.5. Updates `org.springframework.boot:spring-boot-dependencies` from 3.1.4 to 3.1.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.4...v3.1.5) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.1.4 to 3.1.5 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.4...v3.1.5) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 5a836f0..3a6373d 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -28,7 +28,7 @@ 24.1.12 - 3.1.4 + 3.1.5 From 6cb43b927722a904127680e8730d17769fa6960a Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:28:08 +0200 Subject: [PATCH 14/51] Fix syntax for edit --- .github/workflows/update-from-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/update-from-template.yml b/.github/workflows/update-from-template.yml index 2b41fdd..26814a6 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,9 +86,8 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create "$@" || gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || gh pr edit "$@" } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ - -H "${{ env.UPDATE_BRANCH }}" \ --title "Update from template" \ --body "An automated PR to sync changes from the template into this repo" From 7f6fd295c5bc7c91ff015dbe0d540aa4159c7ad5 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 25 Oct 2023 08:46:46 +0200 Subject: [PATCH 15/51] Update update-from-template.yml --- .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 26814a6..a02a834 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ --title "Update from template" \ From 6c3628b57cbc523a5128b54d8cd207912410d363 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:21 +0200 Subject: [PATCH 16/51] Compile with Java 21 --- .github/workflows/checkBuild.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index c23ac42..2e93229 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -21,7 +21,7 @@ jobs: strategy: matrix: - java: [17] + java: [17, 21] distribution: [temurin] steps: From 36b201e9c37a935cc1d209d8427b847a6f81da1f Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 26 Oct 2023 16:18:36 +0200 Subject: [PATCH 17/51] Recommend Java 21 for development --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8468781..2f8dd90 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ We also encourage you to read the [contribution instructions by GitHub](https:// ### Software Requirements You should have the following things installed: * Git -* Java 17 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) +* Java 21 - should be as unmodified as possible (Recommended: [Eclipse Adoptium](https://adoptium.net/temurin/releases/)) * Maven ### Recommended setup From 8dee66b9920c3f0f7a4d799f1c7529671ff04a9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Oct 2023 00:53:53 +0000 Subject: [PATCH 18/51] Bump vaadin.version from 24.2.0 to 24.2.1 Bumps `vaadin.version` from 24.2.0 to 24.2.1. Updates `com.vaadin:vaadin-bom` from 24.2.0 to 24.2.1 Updates `com.vaadin:vaadin-maven-plugin` from 24.2.0 to 24.2.1 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 6f0fdc4..b8491a0 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.2.0 + 24.2.1 3.1.5 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 6d0d7e7..d80562c 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.0 + 24.2.1 From 08519b8ddaa616e3d92b3b1f69ae49d341b1ad3e Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:45:54 +0100 Subject: [PATCH 19/51] Added spring boot info to installation guide https://github.com/xdev-software/vaadin-maps-leaflet-flow/issues/254#issuecomment-1793687030 --- .github/workflows/release.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98628ec..b2560e3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,6 +105,9 @@ jobs: ${{ env.PRIMARY_MAVEN_MODULE }} ${{ steps.version.outputs.release }} + + ### Additional notes + * [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages) ``` publish_central: # Publish the code to central From d3ec5fa723e461ae808ca83496d84b5158cef104 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 00:53:01 +0000 Subject: [PATCH 20/51] Bump vaadin.version from 24.2.1 to 24.2.2 Bumps `vaadin.version` from 24.2.1 to 24.2.2. Updates `com.vaadin:vaadin-bom` from 24.2.1 to 24.2.2 Updates `com.vaadin:vaadin-maven-plugin` from 24.2.1 to 24.2.2 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index b8491a0..d9571e8 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.2.1 + 24.2.2 3.1.5 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index d80562c..5fb2561 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.1 + 24.2.2 From 77bcbb30915b41cb0597d05c960ac185c9a2c8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 00:54:24 +0000 Subject: [PATCH 21/51] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.0 to 3.6.2 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.0 to 3.6.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.0...maven-javadoc-plugin-3.6.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 4cf308c..7884169 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.0 + 3.6.2 attach-javadocs From 0cf81c0b1532c36ec5ea25e391858617f33c463d Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Tue, 7 Nov 2023 09:24:28 +0100 Subject: [PATCH 22/51] Place bracket correctly --- .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 a02a834..3d35a5c 100644 --- a/.github/workflows/update-from-template.yml +++ b/.github/workflows/update-from-template.yml @@ -86,7 +86,7 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh_pr_up() { - gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@" + gh pr create -H "${{ env.UPDATE_BRANCH }}" "$@" || (git checkout "${{ env.UPDATE_BRANCH }}" && gh pr edit "$@") } gh_pr_up -B "${{ steps.main.outputs.current_branch }}" \ --title "Update from template" \ From 56673157609438432ea3ff56f763d1c637ebe1bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 00:48:30 +0000 Subject: [PATCH 23/51] Bump vaadin.version from 24.2.2 to 24.2.4 Bumps `vaadin.version` from 24.2.2 to 24.2.4. Updates `com.vaadin:vaadin-bom` from 24.2.2 to 24.2.4 Updates `com.vaadin:vaadin-maven-plugin` from 24.2.2 to 24.2.4 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index d9571e8..e851364 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.2.2 + 24.2.4 3.1.5 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 0947b26..d1d032f 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.2 + 24.2.4 From e458faaeec9cb3285a9a40e9311fc02fb8f7590a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:50:59 +0000 Subject: [PATCH 24/51] Bump actions/setup-java from 3 to 4 Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/checkBuild.yml | 2 +- .github/workflows/release.yml | 6 +++--- .github/workflows/sonar.yml | 2 +- .github/workflows/test-deploy.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 2e93229..8d2a0bb 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2ae4d2..b370373 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -120,7 +120,7 @@ jobs: git pull - name: Set up JDK Apache Maven Central - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' @@ -152,7 +152,7 @@ jobs: git pull - name: Setup - Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index f7c82af..7c3e344 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -31,7 +31,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index d2a8e2f..0bf5779 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK OSSRH - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' From 4efe636afe4cea99efc0bd8fa196326c2f0a093c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 00:42:14 +0000 Subject: [PATCH 25/51] Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.2 to 3.6.3 Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.2 to 3.6.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.2...maven-javadoc-plugin-3.6.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- standard-maven-template/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 7884169..1c8d796 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -129,7 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.6.2 + 3.6.3 attach-javadocs From 42758e86941e13e66958639eb812cf83dd34d552 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:36:16 +0000 Subject: [PATCH 26/51] Bump org.springframework.boot.version from 3.1.5 to 3.2.0 Bumps `org.springframework.boot.version` from 3.1.5 to 3.2.0. Updates `org.springframework.boot:spring-boot-dependencies` from 3.1.5 to 3.2.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.5...v3.2.0) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.1.5 to 3.2.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.1.5...v3.2.0) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index e851364..894995c 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -28,7 +28,7 @@ 24.2.4 - 3.1.5 + 3.2.0 From 6bc8bdcbae58575f7c0527041c6836adaf71b94b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:36:19 +0000 Subject: [PATCH 27/51] Bump vaadin.version from 24.2.4 to 24.2.5 Bumps `vaadin.version` from 24.2.4 to 24.2.5. Updates `com.vaadin:vaadin-bom` from 24.2.4 to 24.2.5 Updates `com.vaadin:vaadin-maven-plugin` from 24.2.4 to 24.2.5 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index e851364..cd1de20 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.2.4 + 24.2.5 3.1.5 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index d180963..0767f60 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.4 + 24.2.5 From e5e62c8d2267d90fb455e9e012cafa6b220207dd Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Wed, 6 Dec 2023 15:25:32 +0100 Subject: [PATCH 28/51] Fix format of release description --- .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 b5a5ff6..64eebfc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,10 +105,10 @@ jobs: ${{ env.PRIMARY_MAVEN_MODULE }} ${{ steps.version.outputs.release }} + ``` ### Additional notes * [Spring-Boot] You may have to include ``software/xdev`` inside [``vaadin.whitelisted-packages``](https://vaadin.com/docs/latest/integrations/spring/configuration#configure-the-scanning-of-packages) - ``` publish_central: # Publish the code to central runs-on: ubuntu-latest From 4cd258eadde8f86f32e03e96466d3adc2b46bda8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 00:09:07 +0000 Subject: [PATCH 29/51] Bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/checkBuild.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 8d2a0bb..cf1783a 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -56,7 +56,7 @@ jobs: fi - name: Upload demo files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b370373..67e08a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -163,7 +163,7 @@ jobs: working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} - name: Upload licenses - Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: dependencies-licenses path: ${{ env.PRIMARY_MAVEN_MODULE }}/target/site From bff536e0d9895e41c17fb3b7674d552010980bd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 00:59:56 +0000 Subject: [PATCH 30/51] Bump org.springframework.boot.version from 3.2.0 to 3.2.1 Bumps `org.springframework.boot.version` from 3.2.0 to 3.2.1. Updates `org.springframework.boot:spring-boot-dependencies` from 3.2.0 to 3.2.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.0...v3.2.1) Updates `org.springframework.boot:spring-boot-maven-plugin` from 3.2.0 to 3.2.1 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.2.0...v3.2.1) --- updated-dependencies: - dependency-name: org.springframework.boot:spring-boot-dependencies dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.boot:spring-boot-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index b72ecc3..c038f85 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -28,7 +28,7 @@ 24.2.5 - 3.2.0 + 3.2.1 From dbca5598ef77bdf870f7c8432213eb1d7122d1a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:26:38 +0000 Subject: [PATCH 31/51] Bump vaadin.version from 24.2.5 to 24.3.2 Bumps `vaadin.version` from 24.2.5 to 24.3.2. Updates `com.vaadin:vaadin-bom` from 24.2.5 to 24.3.2 Updates `com.vaadin:vaadin-maven-plugin` from 24.2.5 to 24.3.2 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index b72ecc3..25ab55e 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.2.5 + 24.3.2 3.2.0 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 0767f60..9910bb5 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.2.5 + 24.3.2 From d200d7ecb3d452bd52db43271b5988112964f27d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 00:49:03 +0000 Subject: [PATCH 32/51] Bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- standard-maven-template-demo/pom.xml | 2 +- standard-maven-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index 018a999..420499a 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -41,7 +41,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 1c8d796..be62129 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -118,7 +118,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 ${maven.compiler.release} From 4c44c8cc51b4f56692ad18832dbe5dab250c3a4c Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 09:13:00 +0100 Subject: [PATCH 33/51] Rename --- .../pom.xml | 0 {standard-maven-template => vaadin-addon-template}/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template-demo => vaadin-addon-template-demo}/pom.xml (100%) rename {standard-maven-template => vaadin-addon-template}/pom.xml (100%) diff --git a/standard-maven-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml similarity index 100% rename from standard-maven-template-demo/pom.xml rename to vaadin-addon-template-demo/pom.xml diff --git a/standard-maven-template/pom.xml b/vaadin-addon-template/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to vaadin-addon-template/pom.xml From cd1c9a47ce02cab0640facfe2d8576883fee0028 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Thu, 11 Jan 2024 10:20:36 +0100 Subject: [PATCH 34/51] Include jakarta in import order Fixes #5 --- .idea/codeStyles/Project.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index ffd40bd..65b8cb4 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -17,6 +17,8 @@ + + From c630864a8f117d64272e54dc97100ae7051df870 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:10:49 +0100 Subject: [PATCH 35/51] Rework checkstyle * Update IntelliJ Checkstyle version * Move to non obstructing folder ``.config`` * Rework checkstyle file * Remove default values if possible * Remove outdated and non working checks * Remove exclusion for ``software.xdev`` which made this checkstyle useless * Create suppression file for individual projects https://github.com/xdev-software/github/issues/18 --- .config/checkstyle/checkstyle.xml | 137 ++++++++++++ .config/checkstyle/suppressions.xml | 6 + .idea/checkstyle-idea.xml | 4 +- config/checkstyle/checkstyle.xml | 311 ---------------------------- 4 files changed, 145 insertions(+), 313 deletions(-) create mode 100644 .config/checkstyle/checkstyle.xml create mode 100644 .config/checkstyle/suppressions.xml delete mode 100644 config/checkstyle/checkstyle.xml diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..cbda6d4 --- /dev/null +++ b/.config/checkstyle/checkstyle.xml @@ -0,0 +1,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/checkstyle/suppressions.xml b/.config/checkstyle/suppressions.xml new file mode 100644 index 0000000..16d385e --- /dev/null +++ b/.config/checkstyle/suppressions.xml @@ -0,0 +1,6 @@ + + + + diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml index f68c212..9a5d4ff 100644 --- a/.idea/checkstyle-idea.xml +++ b/.idea/checkstyle-idea.xml @@ -1,7 +1,7 @@ - 10.1 + 10.12.5 JavaOnlyWithTests true true @@ -13,7 +13,7 @@ (bundled) (bundled) - $PROJECT_DIR$/config/checkstyle/checkstyle.xml + $PROJECT_DIR$/.config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml deleted file mode 100644 index 710e3e6..0000000 --- a/config/checkstyle/checkstyle.xml +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 09d20ce213c2948b3c95671f2246458ad265225e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:38:37 +0100 Subject: [PATCH 36/51] Checkstyle + Maven --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index ada9282..e3f6ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -26,4 +26,36 @@ repo + + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + .config/checkstyle/checkstyle.xml + + + + + check + + + + + + + + From ff92e4a6ac31dfa48bc2eccd625da0732ad409d2 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:40:46 +0100 Subject: [PATCH 37/51] Run Checkstyle in workflow --- .github/workflows/checkBuild.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index cf1783a..9b50dad 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -61,3 +61,24 @@ jobs: name: demo-files-java-${{ matrix.java }} path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar if-no-files-found: error + + code-style: + runs-on: ubuntu-latest + + strategy: + matrix: + java: [17] + distribution: [temurin] + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'maven' + + - name: Run Checkstyle + run: mvn -B checkstyle:check -P checkstyle -T2C From 39be7170d94de7c655da8cca0caf5701aad419ec Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 15:41:13 +0100 Subject: [PATCH 38/51] Adjust ignored workflow paths --- .github/workflows/checkBuild.yml | 6 ++++++ .github/workflows/sonar.yml | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/checkBuild.yml b/.github/workflows/checkBuild.yml index 9b50dad..c7b324d 100644 --- a/.github/workflows/checkBuild.yml +++ b/.github/workflows/checkBuild.yml @@ -6,10 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' pull_request: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' + - 'assets/**' env: PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }} diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 7c3e344..7600223 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -6,14 +6,16 @@ on: branches: [ develop ] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' pull_request: types: [opened, synchronize, reopened] paths-ignore: - '**.md' + - '.config/**' + - '.idea/**' - 'assets/**' - - 'config/**' env: SONARCLOUD_ORG: ${{ github.event.organization.login }} From eabda82c489e4d6d985b50f4c7fdf065d7b99691 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:15:57 +0100 Subject: [PATCH 39/51] Fix maven checkstyle As root module is just there to track the independent child modules, they don't get the plugin's configuration --- pom.xml | 18 ++-------------- standard-maven-template-demo/pom.xml | 31 ++++++++++++++++++++++++++++ standard-maven-template/pom.xml | 29 ++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 16 deletions(-) diff --git a/pom.xml b/pom.xml index e3f6ed1..aeeadbc 100644 --- a/pom.xml +++ b/pom.xml @@ -29,30 +29,16 @@ + checkstyle org.apache.maven.plugins maven-checkstyle-plugin - 3.3.1 - - - com.puppycrawl.tools - checkstyle - 10.12.7 - - - .config/checkstyle/checkstyle.xml + true - - - - check - - - diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index 420499a..d006d08 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -79,4 +79,35 @@ + + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + + diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index be62129..2efde83 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -204,5 +204,34 @@ + + checkstyle + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + com.puppycrawl.tools + checkstyle + 10.12.7 + + + + ../.config/checkstyle/checkstyle.xml + + + + + check + + + + + + + From e99f23cb4a0e7c77d521cc1e5837beb9829e6e11 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:18:39 +0100 Subject: [PATCH 40/51] Rename --- .../pom.xml | 0 {standard-maven-template => vaadin-addon-template}/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template-demo => vaadin-addon-template-demo}/pom.xml (100%) rename {standard-maven-template => vaadin-addon-template}/pom.xml (100%) diff --git a/standard-maven-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml similarity index 100% rename from standard-maven-template-demo/pom.xml rename to vaadin-addon-template-demo/pom.xml diff --git a/standard-maven-template/pom.xml b/vaadin-addon-template/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to vaadin-addon-template/pom.xml From c10c778467d19c30a8d246bef43bf8e507c34728 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:23:29 +0100 Subject: [PATCH 41/51] Fix maven warning --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index aeeadbc..966e945 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,7 @@ org.apache.maven.plugins maven-checkstyle-plugin + 3.3.1 true From 03f0cb83a5c424f69787a67741f07cb25d5f8223 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:34:35 +0100 Subject: [PATCH 42/51] Ignore new Vaadin 24.3 blob and lock files in repo --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 3e7a31d..8c3a529 100644 --- a/.gitignore +++ b/.gitignore @@ -82,6 +82,8 @@ vite.generated.ts /*/frontend/generated/ /*/frontend/index.html /*/src/main/dev-bundle/ +/*/src/main/bundles/ +*.lock #custom .flattened-pom.xml From 96a73ae16914e65d4e3fe4fa3cd829c1108a72ff Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 11 Jan 2024 16:45:22 +0100 Subject: [PATCH 43/51] Fix checkstyle --- .../xdev/vaadin/chips/SimpleDemo.java | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/vaadin-chip-combobox-demo/src/main/java/software/xdev/vaadin/chips/SimpleDemo.java b/vaadin-chip-combobox-demo/src/main/java/software/xdev/vaadin/chips/SimpleDemo.java index 88b1aa2..bbe40e8 100644 --- a/vaadin-chip-combobox-demo/src/main/java/software/xdev/vaadin/chips/SimpleDemo.java +++ b/vaadin-chip-combobox-demo/src/main/java/software/xdev/vaadin/chips/SimpleDemo.java @@ -1,6 +1,6 @@ package software.xdev.vaadin.chips; -import java.util.Arrays; +import java.util.List; import java.util.Random; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -57,17 +57,16 @@ public class SimpleDemo extends HorizontalLayout private final TextArea taValueChangeInt = new TextArea("ValueChangeEvent", "Change something in the chip combobox to see the result"); + @SuppressWarnings("checkstyle:MagicNumber") public SimpleDemo() { this.initUI(); - this.stringBox.addValueChangeListener(ev -> - this.taValueChangeString.setValue( - "Value: [" + ev.getValue().stream().collect(Collectors.joining(", ")) + "] \r\n" + - "OldValue: [" + ev.getOldValue().stream().collect(Collectors.joining(", ")) + "] \r\n" + - "IsFromClient: " + ev.isFromClient() - ) - ); + this.stringBox.addValueChangeListener(ev -> this.taValueChangeString.setValue( + "Value: [" + String.join(", ", ev.getValue()) + "] \r\n" + + "OldValue: [" + String.join(", ", ev.getOldValue()) + "] \r\n" + + "IsFromClient: " + ev.isFromClient() + )); this.btnSetAvailableInts1to10.addClickListener(ev -> this.setAvailableInts(1, 10)); this.btnSetAvailableInts5to15.addClickListener(ev -> this.setAvailableInts(5, 15)); @@ -75,18 +74,22 @@ public SimpleDemo() this.btnSetRandomAvailableInts.addClickListener(ev -> this.setAvailableIntsRandom()); this.btnShowSelectedInt.addClickListener(ev -> - Notification.show("Selected: " + this.intBox.getValue().stream().map(Object::toString).collect(Collectors.joining(", "))) + Notification.show("Selected: " + this.intBox.getValue().stream() + .map(Object::toString) + .collect(Collectors.joining(", "))) ); - this.intBox.addValueChangeListener(ev -> - this.taValueChangeInt.setValue( - "Value: [" + ev.getValue().stream().map(Object::toString).collect(Collectors.joining(", ")) + "] \r\n" + - "OldValue: [" + ev.getOldValue().stream().map(Object::toString).collect(Collectors.joining(", ")) + "] \r\n" + - "IsFromClient: " + ev.isFromClient() - ) - ); + this.intBox.addValueChangeListener(ev -> this.taValueChangeInt.setValue( + "Value: [" + ev.getValue().stream().map(Object::toString).collect(Collectors.joining(", ")) + + "] \r\n" + + "OldValue: [" + + ev.getOldValue().stream().map(Object::toString).collect(Collectors.joining(", ")) + + "] \r\n" + + "IsFromClient: " + ev.isFromClient() + )); } + @SuppressWarnings("checkstyle:MagicNumber") private void initUI() { this.stringBox.setWidthFull(); @@ -158,14 +161,14 @@ private void setAvailableIntsRandom() private void setAvailableInts(final int startInclusive, final int endInclusive) { - this.intBox.withAllAvailableItems(IntStream.rangeClosed(startInclusive, endInclusive).boxed().collect(Collectors.toList())); + this.intBox.withAllAvailableItems(IntStream.rangeClosed(startInclusive, endInclusive).boxed().toList()); } @Override protected void onAttach(final AttachEvent attachEvent) { - this.stringBox - .withAllAvailableItems(Arrays.asList("Java", "TypeScript", "Shell", "JavaScript", "Kotlin", "C#", "Python")); + this.stringBox.withAllAvailableItems( + List.of("Java", "TypeScript", "Shell", "JavaScript", "Kotlin", "C#", "Python")); this.setAvailableIntsRandom(); From 969bc38c6c62b366cb9f280acb157797807a5a92 Mon Sep 17 00:00:00 2001 From: Alex B <45384811+AB-xdev@users.noreply.github.com> Date: Mon, 15 Jan 2024 08:18:08 +0100 Subject: [PATCH 44/51] Exclude "internal" Vaadin Copilot project https://github.com/vaadin/flow/issues/18449 --- vaadin-addon-template-demo/pom.xml | 7 +++++++ vaadin-addon-template/pom.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index c7eb982..7a649b3 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -58,6 +58,13 @@ com.vaadin vaadin-core + + + + com.vaadin + copilot + + com.xdev-software diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index cf23585..431bafb 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -103,6 +103,13 @@ com.vaadin vaadin-core + + + + com.vaadin + copilot + + From 1714a0e71ccb58bad0acf04a9c698b8c01906699 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 16 Jan 2024 13:55:42 +0100 Subject: [PATCH 45/51] Ignore src/gen(erated) files --- .config/checkstyle/checkstyle.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/checkstyle/checkstyle.xml b/.config/checkstyle/checkstyle.xml index cbda6d4..506f37c 100644 --- a/.config/checkstyle/checkstyle.xml +++ b/.config/checkstyle/checkstyle.xml @@ -34,6 +34,10 @@ + + + + From 0183900d966ab36a5af3de39cf6322f718c8715a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 00:59:39 +0000 Subject: [PATCH 46/51] Bump vaadin.version from 24.3.2 to 24.3.3 Bumps `vaadin.version` from 24.3.2 to 24.3.3. Updates `com.vaadin:vaadin-bom` from 24.3.2 to 24.3.3 Updates `com.vaadin:vaadin-maven-plugin` from 24.3.2 to 24.3.3 --- updated-dependencies: - dependency-name: com.vaadin:vaadin-bom dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.vaadin:vaadin-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- vaadin-addon-template-demo/pom.xml | 2 +- vaadin-addon-template/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vaadin-addon-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml index 7a649b3..70939af 100644 --- a/vaadin-addon-template-demo/pom.xml +++ b/vaadin-addon-template-demo/pom.xml @@ -26,7 +26,7 @@ software.xdev.vaadin.Application - 24.3.2 + 24.3.3 3.2.1 diff --git a/vaadin-addon-template/pom.xml b/vaadin-addon-template/pom.xml index 431bafb..5de6df6 100644 --- a/vaadin-addon-template/pom.xml +++ b/vaadin-addon-template/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.3.2 + 24.3.3 From 6fdcf4683a7eed094918cbd97565e130e3cb82c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 01:01:08 +0000 Subject: [PATCH 47/51] Bump actions/cache from 3 to 4 Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/sonar.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml index 7600223..a255e87 100644 --- a/.github/workflows/sonar.yml +++ b/.github/workflows/sonar.yml @@ -39,14 +39,14 @@ jobs: java-version: 17 - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} From 85dfdc94c644594838aab1bc51e66f2df5d2224e Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 13:03:35 +0100 Subject: [PATCH 48/51] ``com.xdev-software`` -> ``software.xdev`` https://github.com/xdev-software/github/issues/5 --- .github/workflows/release.yml | 6 +++--- .github/workflows/test-deploy.yml | 4 ++-- README.md | 2 +- pom.xml | 2 +- standard-maven-template-demo/pom.xml | 4 ++-- standard-maven-template/pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67e08a5..e03a52d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,7 +101,7 @@ jobs: Add the following lines to your pom: ```XML - com.xdev-software + software.xdev ${{ env.PRIMARY_MAVEN_MODULE }} ${{ steps.version.outputs.release }} @@ -133,8 +133,8 @@ jobs: - name: Publish to Apache Maven Central run: mvn -B deploy -Possrh env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 0bf5779..4e883f8 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -27,6 +27,6 @@ jobs: run: mvn -B deploy -Possrh working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/README.md b/README.md index e288929..b90c3eb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Latest version](https://img.shields.io/maven-central/v/com.xdev-software/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/com.xdev-software/standard-maven-template) +[![Latest version](https://img.shields.io/maven-central/v/software.xdev/standard-maven-template?logo=apache%20maven)](https://mvnrepository.com/artifact/software.xdev/standard-maven-template) [![Build](https://img.shields.io/github/actions/workflow/status/xdev-software/standard-maven-template/checkBuild.yml?branch=develop)](https://github.com/xdev-software/standard-maven-template/actions/workflows/checkBuild.yml?query=branch%3Adevelop) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=xdev-software_standard-maven-template&metric=alert_status)](https://sonarcloud.io/dashboard?id=xdev-software_standard-maven-template) diff --git a/pom.xml b/pom.xml index 966e945..4e48f7a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template-root 1.0.0-SNAPSHOT pom diff --git a/standard-maven-template-demo/pom.xml b/standard-maven-template-demo/pom.xml index d006d08..c612333 100644 --- a/standard-maven-template-demo/pom.xml +++ b/standard-maven-template-demo/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template-demo 1.0.0-SNAPSHOT jar @@ -28,7 +28,7 @@ - com.xdev-software + software.xdev standard-maven-template ${project.version} diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 2efde83..3f871ce 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.xdev-software + software.xdev standard-maven-template 1.0.0-SNAPSHOT jar From 7cb155bfefa9b847b4c86781d9af0ef221631f14 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 13:16:23 +0100 Subject: [PATCH 49/51] Rename --- .../pom.xml | 0 {standard-maven-template => vaadin-addon-template}/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {standard-maven-template-demo => vaadin-addon-template-demo}/pom.xml (100%) rename {standard-maven-template => vaadin-addon-template}/pom.xml (100%) diff --git a/standard-maven-template-demo/pom.xml b/vaadin-addon-template-demo/pom.xml similarity index 100% rename from standard-maven-template-demo/pom.xml rename to vaadin-addon-template-demo/pom.xml diff --git a/standard-maven-template/pom.xml b/vaadin-addon-template/pom.xml similarity index 100% rename from standard-maven-template/pom.xml rename to vaadin-addon-template/pom.xml From 4cfb4dcfa28c88ae4b62b182df8acc0fde1015b1 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 13:33:46 +0100 Subject: [PATCH 50/51] Use new sonatype server https://github.com/xdev-software/github/issues/5 --- standard-maven-template/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/standard-maven-template/pom.xml b/standard-maven-template/pom.xml index 3f871ce..6b14131 100644 --- a/standard-maven-template/pom.xml +++ b/standard-maven-template/pom.xml @@ -76,11 +76,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -195,7 +195,7 @@ true ossrh - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ 30 true From 70ed252fed63e9a0df0bad8ee9a6ace2bf887ab6 Mon Sep 17 00:00:00 2001 From: AB Date: Thu, 18 Jan 2024 16:59:59 +0100 Subject: [PATCH 51/51] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27baace..acf6b6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 4.1.1 +* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev`` +* Updated dependencies + ## 4.1.0 * Use ``Set`` instead of ``Collection`` so that empty value detection works correctly #186 * Replaced ``Label`` with ``Span`` to remove deprecation warnings