Skip to content

Commit dc7845f

Browse files
AB-xdevAB-xdev
authored
Merge pull request #442 from xdev-software/develop
Release
2 parents 5449b59 + 14eb01f commit dc7845f

File tree

8 files changed

+44
-77
lines changed

8 files changed

+44
-77
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/*

‎CHANGELOG.md‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
## 4.2.1
1+
# 4.2.2
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.2.1
26
* Fix naming so that Vaadin Directory sync works [#318](https://github.com/xdev-software/vaadin-addon-template/issues/318)
37
* Updated dependencies
48

5-
## 4.2.0
9+
# 4.2.0
610
* Improved styling
711
* Overlay now has the same minimum width as the underlying DateRangePicker
812
* The default is ``20em``, this can be changed using ``--date-range-picker-min-width``
@@ -11,21 +15,21 @@
1115
* Refactored CSS class names (should cause less conflicts now)
1216
* Updated to Vaadin 24.5
1317

14-
## 4.1.1
18+
# 4.1.1
1519
* Only use client-side locale for formatting when no ``formatLocale`` has been set #353
1620

17-
## 4.1.0
21+
# 4.1.0
1822
* Updated to Vaadin 24.4
1923
* Minor code improvements
2024

21-
## 4.0.2
25+
# 4.0.2
2226
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
2327
* Updated dependencies
2428

25-
## 4.0.1
29+
# 4.0.1
2630
* Various dependency updates including Vaadin 24.1
2731

28-
## 4.0.0
32+
# 4.0.0
2933
⚠️<i>This release contains breaking changes</i>
3034

3135
* Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
@@ -35,19 +39,19 @@
3539
* Added ``AllowRangeLimitExceeding``; default value is ``true``
3640
* Updated dependencies
3741

38-
## 3.0.3
42+
# 3.0.3
3943
* Renamed ``defaultModel`` to ``initialModel``
4044
* Updated dependencies
4145

42-
## 3.0.2
46+
# 3.0.2
4347
* Updated dependencies
4448
* Vaadin 23.3
4549

46-
## 3.0.1
50+
# 3.0.1
4751
* Updated dependencies
4852
* Vaadin 23.2
4953

50-
## 3.0.0
54+
# 3.0.0
5155
⚠️<i>This release contains breaking changes</i>
5256

5357
* Adds support for Vaadin 23+, drops support for Vaadin 14 #155<br/>

‎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-date-range-picker-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-date-range-picker/pom.xml‎

Lines changed: 10 additions & 48 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>
@@ -237,7 +202,7 @@
237202
</build>
238203
<profiles>
239204
<profile>
240-
<id>ossrh</id>
205+
<id>publish-sonatype-central-portal</id>
241206
<build>
242207
<plugins>
243208
<plugin>
@@ -281,16 +246,13 @@
281246
</plugin>
282247

283248
<plugin>
284-
<groupId>org.sonatype.plugins</groupId>
285-
<artifactId>nexus-staging-maven-plugin</artifactId>
286-
<version>1.7.0</version>
249+
<groupId>org.sonatype.central</groupId>
250+
<artifactId>central-publishing-maven-plugin</artifactId>
251+
<version>0.7.0</version>
287252
<extensions>true</extensions>
288253
<configuration>
289-
<serverId>ossrh</serverId>
290-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
291-
<!-- Sometimes OSSRH is really slow -->
292-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
293-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
254+
<publishingServerId>sonatype-central-portal</publishingServerId>
255+
<autoPublish>true</autoPublish>
294256
</configuration>
295257
</plugin>
296258
</plugins>
@@ -308,7 +270,7 @@
308270
<dependency>
309271
<groupId>com.puppycrawl.tools</groupId>
310272
<artifactId>checkstyle</artifactId>
311-
<version>10.23.0</version>
273+
<version>10.23.1</version>
312274
</dependency>
313275
</dependencies>
314276
<configuration>
@@ -345,12 +307,12 @@
345307
<dependency>
346308
<groupId>net.sourceforge.pmd</groupId>
347309
<artifactId>pmd-core</artifactId>
348-
<version>7.12.0</version>
310+
<version>7.13.0</version>
349311
</dependency>
350312
<dependency>
351313
<groupId>net.sourceforge.pmd</groupId>
352314
<artifactId>pmd-java</artifactId>
353-
<version>7.12.0</version>
315+
<version>7.13.0</version>
354316
</dependency>
355317
</dependencies>
356318
</plugin>

0 commit comments

Comments
 (0)