Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
3606cf3
Merge pull request #433 from xdev-software/master
AB-xdev Apr 24, 2025
855c40a
Update net.sourceforge.pmd to v7.13.0
xdev-renovate Apr 26, 2025
7c3c850
Update dependency com.puppycrawl.tools:checkstyle to v10.23.1
xdev-renovate Apr 28, 2025
7d38031
Merge pull request #152 from xdev-software/renovate/com.puppycrawl.to…
AB-xdev Apr 28, 2025
5ba23c7
Merge pull request #151 from xdev-software/renovate/net.sourceforge.pmd
AB-xdev Apr 28, 2025
fb13663
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 29, 2025
aa88f3f
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 5, 2025
25dd0ed
Update lycheeverse/lychee-action digest to 82202e5
xdev-renovate May 10, 2025
22946ad
Update lycheeverse/lychee-action digest to 82202e5
xdev-renovate May 10, 2025
7e5d51b
Merge pull request #153 from xdev-software/renovate/lycheeverse-lyche…
AB-xdev May 12, 2025
8fb7841
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 13, 2025
f202ea5
Update org.springframework.boot.version to v3.4.5
xdev-renovate May 13, 2025
25b17b6
Update vaadin.version to v24.7.4
xdev-renovate May 15, 2025
b161dc4
Merge pull request #319 from xdev-software/renovate/org.springframewo…
AB-xdev May 15, 2025
cdf945e
Merge pull request #323 from xdev-software/renovate/vaadin.version
AB-xdev May 15, 2025
dfe445c
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 15, 2025
0cee3f6
Merge pull request #3 from xdev-software/renovate/lycheeverse-lychee-…
AB-xdev May 15, 2025
c3764dd
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
cc03283
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
7ebef68
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 15, 2025
5304122
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 19, 2025
6b8bdec
Update .gitignore
AB-xdev May 19, 2025
6ac1558
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 20, 2025
a0c76bc
OSSRH → Sonatype Maven Central Portal
AB-xdev May 20, 2025
534a4b1
Merge remote-tracking branch 'origin/update-from-template'
AB-xdev May 20, 2025
1a4d974
Wait until ``validated`` as deployment otherwise takes too long
AB-xdev May 20, 2025
91c31fc
Merge branch 'master' into update-from-template-merged
xdev-gh-bot May 20, 2025
4edd9e8
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 20, 2025
14eb01f
OSSRH → Sonatype Maven Central Portal
AB-xdev May 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/broken-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ vite.generated.ts
.idea/*
!.idea/saveactions_settings.xml
!.idea/checkstyle-idea.xml
!.idea/externalDependencies.xml

!.idea/inspectionProfiles/
.idea/inspectionProfiles/*
Expand Down
26 changes: 15 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
## 4.2.1
# 4.2.2
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
* Updated dependencies

# 4.2.1
* Fix naming so that Vaadin Directory sync works [#318](https://github.com/xdev-software/vaadin-addon-template/issues/318)
* Updated dependencies

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

## 4.1.1
# 4.1.1
* Only use client-side locale for formatting when no ``formatLocale`` has been set #353

## 4.1.0
# 4.1.0
* Updated to Vaadin 24.4
* Minor code improvements

## 4.0.2
# 4.0.2
* ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
* Updated dependencies

## 4.0.1
# 4.0.1
* Various dependency updates including Vaadin 24.1

## 4.0.0
# 4.0.0
⚠️<i>This release contains breaking changes</i>

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

## 3.0.3
# 3.0.3
* Renamed ``defaultModel`` to ``initialModel``
* Updated dependencies

## 3.0.2
# 3.0.2
* Updated dependencies
* Vaadin 23.3

## 3.0.1
# 3.0.1
* Updated dependencies
* Vaadin 23.2

## 3.0.0
# 3.0.0
⚠️<i>This release contains breaking changes</i>

* Adds support for Vaadin 23+, drops support for Vaadin 14 #155<br/>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions vaadin-date-range-picker-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
58 changes: 10 additions & 48 deletions vaadin-date-range-picker/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -237,7 +202,7 @@
</build>
<profiles>
<profile>
<id>ossrh</id>
<id>publish-sonatype-central-portal</id>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -281,16 +246,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>
Expand All @@ -308,7 +270,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>10.23.0</version>
<version>10.23.1</version>
</dependency>
</dependencies>
<configuration>
Expand Down Expand Up @@ -345,12 +307,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>
Expand Down