Merge pull request #543 from xdev-software/develop

Release

Author: AB-xdev

.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
 

.github/workflows/release.yml

@@ -124,22 +124,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 }}
 

.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 }}

.gitignore

@@ -94,6 +94,7 @@ vite.generated.ts
 .idea/*
 !.idea/saveactions_settings.xml
 !.idea/checkstyle-idea.xml
+!.idea/externalDependencies.xml
 
 !.idea/inspectionProfiles/
 .idea/inspectionProfiles/*

.idea/externalDependencies.xml

@@ -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
 ⚠️<i>This release contains breaking changes</i>
 
 * 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
 ⚠️<i>This release contains breaking changes</i>
 
 * Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
   <i>If you are still using Vaadin 23, use the ``2.x`` versions.</i>
   * 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
 ⚠️<i>This release contains breaking changes</i>
 
 * Update to Vaadin 23

CHANGELOG.md

@@ -45,7 +45,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.0</version>
+								<version>10.23.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -82,12 +82,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.12.0</version>
+								<version>7.13.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.12.0</version>
+								<version>7.13.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

pom.xml

@@ -29,9 +29,9 @@
 		<mainClass>software.xdev.vaadin.Application</mainClass>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.7.2</vaadin.version>
+		<vaadin.version>24.7.4</vaadin.version>
 
-		<org.springframework.boot.version>3.4.4</org.springframework.boot.version>
+		<org.springframework.boot.version>3.4.5</org.springframework.boot.version>
 	</properties>
 
 	<dependencyManagement>

vaadin-maps-leaflet-flow-demo/pom.xml

@@ -49,7 +49,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency-Versions -->
-		<vaadin.version>24.7.2</vaadin.version>
+		<vaadin.version>24.7.4</vaadin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -64,41 +64,6 @@
 		</dependencies>
 	</dependencyManagement>
 
-	<repositories>
-		<!-- The order of definitions matters. Explicitly defining central here 
-			to make sure it has the highest priority. -->
-		<repository>
-			<id>central</id>
-			<url>https://repo.maven.apache.org/maven2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<pluginRepositories>
-		<!-- The order of definitions matters. Explicitly defining central here 
-			to make sure it has the highest priority. -->
-		<pluginRepository>
-			<id>central</id>
-			<url>https://repo.maven.apache.org/maven2</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	</pluginRepositories>
-
-	<distributionManagement>
-		<snapshotRepository>
-			<id>ossrh</id>
-			<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-		</snapshotRepository>
-		<repository>
-			<id>ossrh</id>
-			<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-		</repository>
-	</distributionManagement>
-
 	<dependencies>
 		<dependency>
 			<groupId>com.vaadin</groupId>
@@ -108,7 +73,7 @@
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.18.3</version>
+			<version>2.19.0</version>
 		</dependency>
 
 		<dependency>
@@ -249,7 +214,7 @@
 	</build>
 	<profiles>
 		<profile>
-			<id>ossrh</id>
+			<id>publish-sonatype-central-portal</id>
 			<build>
 				<plugins>
 					<plugin>
@@ -293,16 +258,13 @@
 					</plugin>
 
 					<plugin>
-						<groupId>org.sonatype.plugins</groupId>
-						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.7.0</version>
+						<groupId>org.sonatype.central</groupId>
+						<artifactId>central-publishing-maven-plugin</artifactId>
+						<version>0.7.0</version>
 						<extensions>true</extensions>
 						<configuration>
-							<serverId>ossrh</serverId>
-							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-							<!-- Sometimes OSSRH is really slow -->
-							<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
-							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+							<publishingServerId>sonatype-central-portal</publishingServerId>
+							<autoPublish>true</autoPublish>
 						</configuration>
 					</plugin>
 				</plugins>
@@ -320,7 +282,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.23.0</version>
+								<version>10.23.1</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -357,12 +319,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.12.0</version>
+								<version>7.13.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.12.0</version>
+								<version>7.13.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>