From acc4965b79e18120abc09d018bf503da4b8b781c Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Wed, 16 Apr 2025 04:12:32 +0000 Subject: [PATCH 01/13] Update vaadin.version to v24.7.2 --- 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 17c5c7e2..b8ec8ab2 100644 --- a/template-placeholder-demo/pom.xml +++ b/template-placeholder-demo/pom.xml @@ -29,7 +29,7 @@ software.xdev.vaadin.Application - 24.7.1 + 24.7.2 3.4.4 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 7c8d56e3..7f8fac3c 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.7.1 + 24.7.2 From 9f5cab50cee12ff7b938c164170d8d064f07be5a Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 22 Apr 2025 08:39:58 +0200 Subject: [PATCH 02/13] 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 03/13] 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 04/13] 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 3d7916072c2abb297d5a250fd4f3296a018cced3 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Mon, 5 May 2025 04:15:50 +0000 Subject: [PATCH 05/13] Update dependency com.fasterxml.jackson.core:jackson-databind to v2.19.0 --- vaadin-maps-leaflet-flow/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaadin-maps-leaflet-flow/pom.xml b/vaadin-maps-leaflet-flow/pom.xml index b7ee7b73..8bcc746a 100644 --- a/vaadin-maps-leaflet-flow/pom.xml +++ b/vaadin-maps-leaflet-flow/pom.xml @@ -108,7 +108,7 @@ com.fasterxml.jackson.core jackson-databind - 2.18.3 + 2.19.0 From 25dd0edc236a5305346fd2f2e64c8f058e114b6f Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Sat, 10 May 2025 04:10:09 +0000 Subject: [PATCH 06/13] 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 07/13] 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 f202ea5f7abe0681cfddb840972f79d9a43efe53 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Tue, 13 May 2025 04:13:44 +0000 Subject: [PATCH 08/13] Update org.springframework.boot.version to v3.4.5 --- template-placeholder-demo/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template-placeholder-demo/pom.xml b/template-placeholder-demo/pom.xml index b8ec8ab2..8e37d6e3 100644 --- a/template-placeholder-demo/pom.xml +++ b/template-placeholder-demo/pom.xml @@ -31,7 +31,7 @@ 24.7.2 - 3.4.4 + 3.4.5 From 25b17b69802caea8cf3da286c36ce96d0dd11356 Mon Sep 17 00:00:00 2001 From: XDEV Renovate Bot Date: Thu, 15 May 2025 04:13:54 +0000 Subject: [PATCH 09/13] Update vaadin.version to v24.7.4 --- 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 b8ec8ab2..71c72c47 100644 --- a/template-placeholder-demo/pom.xml +++ b/template-placeholder-demo/pom.xml @@ -29,7 +29,7 @@ software.xdev.vaadin.Application - 24.7.2 + 24.7.4 3.4.4 diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index f9a1def6..ec53158f 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.7.2 + 24.7.4 From 6b8bdec7766422e80fed7eb74878ccf69614933c Mon Sep 17 00:00:00 2001 From: AB Date: Mon, 19 May 2025 16:14:14 +0200 Subject: [PATCH 10/13] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 116a656e..5c850540 100644 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,7 @@ hs_err_pid* .idea/* !.idea/saveactions_settings.xml !.idea/checkstyle-idea.xml +!.idea/externalDependencies.xml !.idea/inspectionProfiles/ .idea/inspectionProfiles/* From a0c76bcc1a1ab0c7f48a879f5c969885687536f3 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 09:05:07 +0200 Subject: [PATCH 11/13] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Ce?= =?UTF-8?q?ntral=20Portal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/xdev-software/standard-maven-template/issues/155 --- .github/workflows/release.yml | 12 ++++---- .github/workflows/test-deploy.yml | 12 ++++---- template-placeholder/pom.xml | 51 +++++-------------------------- 3 files changed, 19 insertions(+), 56 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8bd0f3c2..2cb33930 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -121,22 +121,22 @@ jobs: git config --global user.name "GitHub Actions" git pull - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml java-version: '17' distribution: 'temurin' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_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 03f5339e..8a858912 100644 --- a/.github/workflows/test-deploy.yml +++ b/.github/workflows/test-deploy.yml @@ -13,21 +13,21 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up JDK OSSRH + - name: Set up JDK uses: actions/setup-java@v4 with: # running setup-java again overwrites the settings.xml distribution: 'temurin' java-version: '17' - server-id: ossrh + server-id: sonatype-central-portal server-username: MAVEN_CENTRAL_USERNAME server-password: MAVEN_CENTRAL_TOKEN gpg-passphrase: MAVEN_GPG_PASSPHRASE gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - - name: Publish to OSSRH - run: ../mvnw -B deploy -Possrh -DskipTests + - name: Publish to Central Portal + run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests working-directory: ${{ env.PRIMARY_MAVEN_MODULE }} env: - MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }} - MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }} + MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }} + MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 19b3fce8..55fb55a6 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -49,41 +49,6 @@ UTF-8 - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - 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/ - - - @@ -176,7 +141,7 @@ - ossrh + publish-sonatype-central-portal @@ -220,16 +185,14 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true + published From 1a4d9748107c3be028e90e1f42003c2c2cebfc54 Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 09:38:39 +0200 Subject: [PATCH 12/13] Wait until ``validated`` as deployment otherwise takes too long See https://github.com/xdev-software/standard-maven-template/issues/155 --- template-placeholder/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/template-placeholder/pom.xml b/template-placeholder/pom.xml index 55fb55a6..5a67e474 100644 --- a/template-placeholder/pom.xml +++ b/template-placeholder/pom.xml @@ -192,7 +192,6 @@ sonatype-central-portal true - published From cea237c216b5a282a576f0d7f5dd35e55fc582bb Mon Sep 17 00:00:00 2001 From: AB Date: Tue, 20 May 2025 13:50:03 +0200 Subject: [PATCH 13/13] =?UTF-8?q?OSSRH=20=E2=86=92=20Sonatype=20Maven=20Ce?= =?UTF-8?q?ntral=20Portal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/xdev-software/standard-maven-template/issues/155 --- CHANGELOG.md | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9fabdaab..524159b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,49 +1,53 @@ -## 4.6.2 +# 4.6.3 +* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155) +* Updated dependencies + +# 4.6.2 * Fix naming so that Vaadin Directory sync works #526 -## 4.6.1 +# 4.6.1 * Updated dependencies -## 4.6.0 +# 4.6.0 * Changed all occurrences of ``Integer`` and ``Double`` to ``Number`` for improved compatibility with Leaflet's API * Updated OpenStreetMap's Tile-Server address to ``tile.openstreetmap.org`` [openstreetmap/operations#737](https://github.com/openstreetmap/operations/issues/737) -## 4.5.0 +# 4.5.0 * Added support for [WMS](https://leafletjs.com/reference.html#tilelayer-wms) #486 * Updated dependencies -## 4.4.0 +# 4.4.0 * Added support for [GeoJSON](https://leafletjs.com/reference.html#geojson) and [FeatureGroup](https://leafletjs.com/reference.html#featuregroup) #438 * Add "draggable" property to LMarkerOptions #413 (thanks to @ChristianHoesel) -## 4.3.0 +# 4.3.0 * Updated to Vaadin 24.4 * Deduplicated ``tLMapZoomPanOptions`` -## 4.2.1 +# 4.2.1 * Handle ``LEvented#off`` in the same way as ``LEvented#on`` * Fix incorrect formatting leading to JS error * Updated dependencies -## 4.2.0 +# 4.2.0 * Fixed some invalid built JavaScript commands #330 * Add basic support for CRS #333 * Added a few new showcase demos * Updated dependencies -## 4.1.1 +# 4.1.1 * ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev`` * Updated dependencies -## 4.1.0 +# 4.1.0 * Provide a workaround that fixes a problem where certain methods didn't work instantly after the map was created #305 * Moved some container specific methods to ``MapContainer`` -## 4.0.1 +# 4.0.1 * Added shortcut method ``invokeSelfReturn`` #282 * Updated dependencies -## 4.0.0 +# 4.0.0 ⚠️This release contains breaking changes * The complete API got reworked and now has the [same structure as Leaflet](https://leafletjs.com/reference.html). @@ -63,39 +67,39 @@ * However keep in mind when creating a lot of elements that you may have to free up memory on the client (manually) * Integrated default Leaflet resources -## 3.0.2 +# 3.0.2 * Added support for Polyline #266 (thanks to @blitzdose) -## 3.0.1 +# 3.0.1 * Fixed ``divIcon`` being displayed incorrectly [due to a default ``iconSize`` of ``12px``](https://github.com/Leaflet/Leaflet/issues/4238) #246 * Updated dependencies * Updated leaflet to [``1.9.4``](https://github.com/Leaflet/Leaflet/blob/b6b56f6e707142c177fad2f67827a5007e56736a/CHANGELOG.md#194-2023-05-18) #247 -## 3.0.0 +# 3.0.0 ⚠️This release contains breaking changes * Adds support for Vaadin 24+, drops support for Vaadin 23
If you are still using Vaadin 23, use the ``2.x`` versions. * Requires Java 17+ -## 2.0.4 +# 2.0.4 * Added method ``centerAndZoom`` in ``LMap`` * Fixed a problem where an invalid ``iconSize`` was transferred to leaflet which caused a client side exception (#199) * Updated various dependencies -## 2.0.3 +# 2.0.3 * Updated dependencies * Fixed problem with setting lon/lan in LMarker * Added constructors for LMap -## 2.0.2 +# 2.0.2 * Updated dependencies -## 2.0.1 +# 2.0.1 * Updated dependencies * Vaadin 23.2 -## 2.0.0 +# 2.0.0 ⚠️This release contains breaking changes * Update to Vaadin 23