Skip to content

Commit 672f7e3

Browse files
AB-xdevAB-xdev
authored
Merge pull request #224 from xdev-software/develop
Release
2 parents 98e8316 + 802bb65 commit 672f7e3

File tree

8 files changed

+39
-72
lines changed

8 files changed

+39
-72
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: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
## 2.1.1
1+
# 2.1.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+
# 2.1.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-
## 2.1.0
9+
# 2.1.0
610
* Updated to Vaadin 24.4
711

8-
## 2.0.1
12+
# 2.0.1
913
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
1014
* Replaced deprecated ``Label``-Vaadin component with ``Span``
1115
* Updated dependencies
1216

13-
## 2.0.0
17+
# 2.0.0
1418
⚠️<i>This release contains breaking changes</i>
1519

1620
* Adds support for Vaadin 24+, drops support for Vaadin 23<br/>
@@ -19,8 +23,8 @@
1923
* Updated dependencies
2024

2125

22-
## 1.0.1
26+
# 1.0.1
2327
* Updated dependencies
2428

25-
## 1.0.0
29+
# 1.0.0
2630
Initial release

‎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-editable-label-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-editable-label/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>
@@ -238,7 +203,7 @@
238203
</build>
239204
<profiles>
240205
<profile>
241-
<id>ossrh</id>
206+
<id>publish-sonatype-central-portal</id>
242207
<build>
243208
<plugins>
244209
<plugin>
@@ -282,16 +247,13 @@
282247
</plugin>
283248

284249
<plugin>
285-
<groupId>org.sonatype.plugins</groupId>
286-
<artifactId>nexus-staging-maven-plugin</artifactId>
287-
<version>1.7.0</version>
250+
<groupId>org.sonatype.central</groupId>
251+
<artifactId>central-publishing-maven-plugin</artifactId>
252+
<version>0.7.0</version>
288253
<extensions>true</extensions>
289254
<configuration>
290-
<serverId>ossrh</serverId>
291-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
292-
<!-- Sometimes OSSRH is really slow -->
293-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
294-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
255+
<publishingServerId>sonatype-central-portal</publishingServerId>
256+
<autoPublish>true</autoPublish>
295257
</configuration>
296258
</plugin>
297259
</plugins>
@@ -309,7 +271,7 @@
309271
<dependency>
310272
<groupId>com.puppycrawl.tools</groupId>
311273
<artifactId>checkstyle</artifactId>
312-
<version>10.23.0</version>
274+
<version>10.23.1</version>
313275
</dependency>
314276
</dependencies>
315277
<configuration>
@@ -346,12 +308,12 @@
346308
<dependency>
347309
<groupId>net.sourceforge.pmd</groupId>
348310
<artifactId>pmd-core</artifactId>
349-
<version>7.12.0</version>
311+
<version>7.13.0</version>
350312
</dependency>
351313
<dependency>
352314
<groupId>net.sourceforge.pmd</groupId>
353315
<artifactId>pmd-java</artifactId>
354-
<version>7.12.0</version>
316+
<version>7.13.0</version>
355317
</dependency>
356318
</dependencies>
357319
</plugin>

0 commit comments

Comments
 (0)