diff --git a/.github/workflows/broken-links.yml b/.github/workflows/broken-links.yml index 32f412f..16a3f37 100644 --- a/.github/workflows/broken-links.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7a88a0f..dd32352 100644 --- a/.github/workflows/release.yml +++ b/.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 }} diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml index 03f5339..8a85891 100644 --- a/.github/workflows/test-deploy.yml +++ b/.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 }} diff --git a/.gitignore b/.gitignore index 41570f9..8ffb470 100644 --- a/.gitignore +++ b/.gitignore @@ -94,6 +94,7 @@ vite.generated.ts .idea/* !.idea/saveactions_settings.xml !.idea/checkstyle-idea.xml +!.idea/externalDependencies.xml !.idea/inspectionProfiles/ .idea/inspectionProfiles/* diff --git a/CHANGELOG.md b/CHANGELOG.md index 94cb4bb..2dc4b97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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`` @@ -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 ⚠️This release contains breaking changes * Adds support for Vaadin 24+, drops support for Vaadin 23
@@ -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 ⚠️This release contains breaking changes * Adds support for Vaadin 23+, drops support for Vaadin 14 #155
diff --git a/pom.xml b/pom.xml index d5b7db4..c5f77bd 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 @@ -82,12 +82,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0 diff --git a/vaadin-date-range-picker-demo/pom.xml b/vaadin-date-range-picker-demo/pom.xml index 22d38a2..7d34ea7 100644 --- a/vaadin-date-range-picker-demo/pom.xml +++ b/vaadin-date-range-picker-demo/pom.xml @@ -29,9 +29,9 @@ software.xdev.vaadin.Application - 24.7.2 + 24.7.4 - 3.4.4 + 3.4.5 diff --git a/vaadin-date-range-picker/pom.xml b/vaadin-date-range-picker/pom.xml index 512dd01..ef9e335 100644 --- a/vaadin-date-range-picker/pom.xml +++ b/vaadin-date-range-picker/pom.xml @@ -49,7 +49,7 @@ UTF-8 - 24.7.2 + 24.7.4 @@ -64,41 +64,6 @@ - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - - central - https://repo.maven.apache.org/maven2 - - false - - - - - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - com.vaadin @@ -237,7 +202,7 @@ - ossrh + publish-sonatype-central-portal @@ -281,16 +246,13 @@ - org.sonatype.plugins - nexus-staging-maven-plugin - 1.7.0 + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://s01.oss.sonatype.org/ - - 30 - true + sonatype-central-portal + true @@ -308,7 +270,7 @@ com.puppycrawl.tools checkstyle - 10.23.0 + 10.23.1 @@ -345,12 +307,12 @@ net.sourceforge.pmd pmd-core - 7.12.0 + 7.13.0 net.sourceforge.pmd pmd-java - 7.12.0 + 7.13.0