Skip to content

Commit 98f236d

Browse files
AB-xdevAB-xdev
authored
Merge pull request #543 from xdev-software/develop
Release
2 parents fe80927 + cea237c commit 98f236d

File tree

9 files changed

+61
-87
lines changed

9 files changed

+61
-87
lines changed

‎.github/workflows/broken-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
- name: Link Checker
2121
id: lychee
22-
uses: lycheeverse/lychee-action@1d97d84f0bc547f7b25f4c2170d87d810dc2fb2c # v2
22+
uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
2323
with:
2424
fail: false # Don't fail on broken links, create an issue instead
2525

‎.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,22 +124,22 @@ jobs:
124124
git config --global user.name "GitHub Actions"
125125
git pull
126126
127-
- name: Set up JDK OSSRH
127+
- name: Set up JDK
128128
uses: actions/setup-java@v4
129129
with: # running setup-java again overwrites the settings.xml
130130
java-version: '17'
131131
distribution: 'temurin'
132-
server-id: ossrh
132+
server-id: sonatype-central-portal
133133
server-username: MAVEN_CENTRAL_USERNAME
134134
server-password: MAVEN_CENTRAL_TOKEN
135135
gpg-passphrase: MAVEN_GPG_PASSPHRASE
136136
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
137137

138-
- name: Publish to OSSRH
139-
run: ../mvnw -B deploy -Possrh -DskipTests
138+
- name: Publish to Central Portal
139+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
140140
env:
141-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
142-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
141+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
142+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
143143
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
144144
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
145145

‎.github/workflows/test-deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515

16-
- name: Set up JDK OSSRH
16+
- name: Set up JDK
1717
uses: actions/setup-java@v4
1818
with: # running setup-java again overwrites the settings.xml
1919
distribution: 'temurin'
2020
java-version: '17'
21-
server-id: ossrh
21+
server-id: sonatype-central-portal
2222
server-username: MAVEN_CENTRAL_USERNAME
2323
server-password: MAVEN_CENTRAL_TOKEN
2424
gpg-passphrase: MAVEN_GPG_PASSPHRASE
2525
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
2626

27-
- name: Publish to OSSRH
28-
run: ../mvnw -B deploy -Possrh -DskipTests
27+
- name: Publish to Central Portal
28+
run: ../mvnw -B deploy -P publish-sonatype-central-portal -DskipTests
2929
working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
3030
env:
31-
MAVEN_CENTRAL_USERNAME: ${{ secrets.S01_OSS_SONATYPE_MAVEN_USERNAME }}
32-
MAVEN_CENTRAL_TOKEN: ${{ secrets.S01_OSS_SONATYPE_MAVEN_TOKEN }}
31+
MAVEN_CENTRAL_USERNAME: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_USERNAME }}
32+
MAVEN_CENTRAL_TOKEN: ${{ secrets.SONATYPE_MAVEN_CENTRAL_PORTAL_TOKEN }}
3333
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ vite.generated.ts
9494
.idea/*
9595
!.idea/saveactions_settings.xml
9696
!.idea/checkstyle-idea.xml
97+
!.idea/externalDependencies.xml
9798

9899
!.idea/inspectionProfiles/
99100
.idea/inspectionProfiles/*

‎.idea/externalDependencies.xml

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,53 @@
1-
## 4.6.2
1+
# 4.6.3
2+
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
3+
* Updated dependencies
4+
5+
# 4.6.2
26
* Fix naming so that Vaadin Directory sync works #526
37

4-
## 4.6.1
8+
# 4.6.1
59
* Updated dependencies
610

7-
## 4.6.0
11+
# 4.6.0
812
* Changed all occurrences of ``Integer`` and ``Double`` to ``Number`` for improved compatibility with Leaflet's API
913
* Updated OpenStreetMap's Tile-Server address to ``tile.openstreetmap.org`` [openstreetmap/operations#737](https://github.com/openstreetmap/operations/issues/737)
1014

11-
## 4.5.0
15+
# 4.5.0
1216
* Added support for [WMS](https://leafletjs.com/reference.html#tilelayer-wms) #486
1317
* Updated dependencies
1418

15-
## 4.4.0
19+
# 4.4.0
1620
* Added support for [GeoJSON](https://leafletjs.com/reference.html#geojson) and [FeatureGroup](https://leafletjs.com/reference.html#featuregroup) #438
1721
* Add "draggable" property to LMarkerOptions #413 (thanks to @ChristianHoesel)
1822

19-
## 4.3.0
23+
# 4.3.0
2024
* Updated to Vaadin 24.4
2125
* Deduplicated ``tLMapZoomPanOptions``
2226

23-
## 4.2.1
27+
# 4.2.1
2428
* Handle ``LEvented#off`` in the same way as ``LEvented#on``
2529
* Fix incorrect formatting leading to JS error
2630
* Updated dependencies
2731

28-
## 4.2.0
32+
# 4.2.0
2933
* Fixed some invalid built JavaScript commands #330
3034
* Add basic support for CRS #333
3135
* Added a few new showcase demos
3236
* Updated dependencies
3337

34-
## 4.1.1
38+
# 4.1.1
3539
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
3640
* Updated dependencies
3741

38-
## 4.1.0
42+
# 4.1.0
3943
* Provide a workaround that fixes a problem where certain methods didn't work instantly after the map was created #305
4044
* Moved some container specific methods to ``MapContainer``
4145

42-
## 4.0.1
46+
# 4.0.1
4347
* Added shortcut method ``invokeSelfReturn`` #282
4448
* Updated dependencies
4549

46-
## 4.0.0
50+
# 4.0.0
4751
⚠️<i>This release contains breaking changes</i>
4852

4953
* The complete API got reworked and now has the [same structure as Leaflet](https://leafletjs.com/reference.html).
@@ -63,39 +67,39 @@
6367
* However keep in mind when creating a lot of elements that you may have to free up memory on the client (manually)
6468
* Integrated default Leaflet resources
6569

66-
## 3.0.2
70+
# 3.0.2
6771
* Added support for Polyline #266 (thanks to @blitzdose)
6872

69-
## 3.0.1
73+
# 3.0.1
7074
* Fixed ``divIcon`` being displayed incorrectly [due to a default ``iconSize`` of ``12px``](https://github.com/Leaflet/Leaflet/issues/4238) #246
7175
* Updated dependencies
7276
* Updated leaflet to [``1.9.4``](https://github.com/Leaflet/Leaflet/blob/b6b56f6e707142c177fad2f67827a5007e56736a/CHANGELOG.md#194-2023-05-18) #247
7377

74-
## 3.0.0
78+
# 3.0.0
7579
⚠️<i>This release contains breaking changes</i>
7680

7781
* Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
7882
<i>If you are still using Vaadin 23, use the ``2.x`` versions.</i>
7983
* Requires Java 17+
8084

81-
## 2.0.4
85+
# 2.0.4
8286
* Added method ``centerAndZoom`` in ``LMap``
8387
* Fixed a problem where an invalid ``iconSize`` was transferred to leaflet which caused a client side exception (#199)
8488
* Updated various dependencies
8589

86-
## 2.0.3
90+
# 2.0.3
8791
* Updated dependencies
8892
* Fixed problem with setting lon/lan in LMarker
8993
* Added constructors for LMap
9094

91-
## 2.0.2
95+
# 2.0.2
9296
* Updated dependencies
9397

94-
## 2.0.1
98+
# 2.0.1
9599
* Updated dependencies
96100
* Vaadin 23.2
97101

98-
## 2.0.0
102+
# 2.0.0
99103
⚠️<i>This release contains breaking changes</i>
100104

101105
* Update to Vaadin 23

‎pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<dependency>
4646
<groupId>com.puppycrawl.tools</groupId>
4747
<artifactId>checkstyle</artifactId>
48-
<version>10.23.0</version>
48+
<version>10.23.1</version>
4949
</dependency>
5050
</dependencies>
5151
<configuration>
@@ -82,12 +82,12 @@
8282
<dependency>
8383
<groupId>net.sourceforge.pmd</groupId>
8484
<artifactId>pmd-core</artifactId>
85-
<version>7.12.0</version>
85+
<version>7.13.0</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>net.sourceforge.pmd</groupId>
8989
<artifactId>pmd-java</artifactId>
90-
<version>7.12.0</version>
90+
<version>7.13.0</version>
9191
</dependency>
9292
</dependencies>
9393
</plugin>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<mainClass>software.xdev.vaadin.Application</mainClass>
3030

3131
<!-- Dependency-Versions -->
32-
<vaadin.version>24.7.2</vaadin.version>
32+
<vaadin.version>24.7.4</vaadin.version>
3333

34-
<org.springframework.boot.version>3.4.4</org.springframework.boot.version>
34+
<org.springframework.boot.version>3.4.5</org.springframework.boot.version>
3535
</properties>
3636

3737
<dependencyManagement>

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

Lines changed: 11 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5050

5151
<!-- Dependency-Versions -->
52-
<vaadin.version>24.7.2</vaadin.version>
52+
<vaadin.version>24.7.4</vaadin.version>
5353
</properties>
5454

5555
<dependencyManagement>
@@ -64,41 +64,6 @@
6464
</dependencies>
6565
</dependencyManagement>
6666

67-
<repositories>
68-
<!-- The order of definitions matters. Explicitly defining central here
69-
to make sure it has the highest priority. -->
70-
<repository>
71-
<id>central</id>
72-
<url>https://repo.maven.apache.org/maven2</url>
73-
<snapshots>
74-
<enabled>false</enabled>
75-
</snapshots>
76-
</repository>
77-
</repositories>
78-
79-
<pluginRepositories>
80-
<!-- The order of definitions matters. Explicitly defining central here
81-
to make sure it has the highest priority. -->
82-
<pluginRepository>
83-
<id>central</id>
84-
<url>https://repo.maven.apache.org/maven2</url>
85-
<snapshots>
86-
<enabled>false</enabled>
87-
</snapshots>
88-
</pluginRepository>
89-
</pluginRepositories>
90-
91-
<distributionManagement>
92-
<snapshotRepository>
93-
<id>ossrh</id>
94-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
95-
</snapshotRepository>
96-
<repository>
97-
<id>ossrh</id>
98-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
99-
</repository>
100-
</distributionManagement>
101-
10267
<dependencies>
10368
<dependency>
10469
<groupId>com.vaadin</groupId>
@@ -108,7 +73,7 @@
10873
<dependency>
10974
<groupId>com.fasterxml.jackson.core</groupId>
11075
<artifactId>jackson-databind</artifactId>
111-
<version>2.18.3</version>
76+
<version>2.19.0</version>
11277
</dependency>
11378

11479
<dependency>
@@ -249,7 +214,7 @@
249214
</build>
250215
<profiles>
251216
<profile>
252-
<id>ossrh</id>
217+
<id>publish-sonatype-central-portal</id>
253218
<build>
254219
<plugins>
255220
<plugin>
@@ -293,16 +258,13 @@
293258
</plugin>
294259

295260
<plugin>
296-
<groupId>org.sonatype.plugins</groupId>
297-
<artifactId>nexus-staging-maven-plugin</artifactId>
298-
<version>1.7.0</version>
261+
<groupId>org.sonatype.central</groupId>
262+
<artifactId>central-publishing-maven-plugin</artifactId>
263+
<version>0.7.0</version>
299264
<extensions>true</extensions>
300265
<configuration>
301-
<serverId>ossrh</serverId>
302-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
303-
<!-- Sometimes OSSRH is really slow -->
304-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
305-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
266+
<publishingServerId>sonatype-central-portal</publishingServerId>
267+
<autoPublish>true</autoPublish>
306268
</configuration>
307269
</plugin>
308270
</plugins>
@@ -320,7 +282,7 @@
320282
<dependency>
321283
<groupId>com.puppycrawl.tools</groupId>
322284
<artifactId>checkstyle</artifactId>
323-
<version>10.23.0</version>
285+
<version>10.23.1</version>
324286
</dependency>
325287
</dependencies>
326288
<configuration>
@@ -357,12 +319,12 @@
357319
<dependency>
358320
<groupId>net.sourceforge.pmd</groupId>
359321
<artifactId>pmd-core</artifactId>
360-
<version>7.12.0</version>
322+
<version>7.13.0</version>
361323
</dependency>
362324
<dependency>
363325
<groupId>net.sourceforge.pmd</groupId>
364326
<artifactId>pmd-java</artifactId>
365-
<version>7.12.0</version>
327+
<version>7.13.0</version>
366328
</dependency>
367329
</dependencies>
368330
</plugin>

0 commit comments

Comments
 (0)