Skip to content

Release #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AB-xdev merged 23 commits into from
May 20, 2025
Merged

Release #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9f5cab5
Enforce IDEA plugins
AB-xdev Apr 22, 2025
e67bdaa
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Apr 22, 2025
855c40a
Update net.sourceforge.pmd to v7.13.0
xdev-renovate Apr 26, 2025
c9a9c09
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Apr 28, 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
04f9c4c
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
64a3df0
Merge pull request #28 from xdev-software/master
AB-xdev 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
793c926
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot May 15, 2025
1ebe621
Update testcontainers.version to v1.21.0
xdev-renovate May 16, 2025
6b8bdec
Update .gitignore
AB-xdev May 19, 2025
a0c76bc
OSSRH → Sonatype Maven Central Portal
AB-xdev May 20, 2025
1a4d974
Wait until ``validated`` as deployment otherwise takes too long
AB-xdev May 20, 2025
e78e2bc
Merge pull request #29 from xdev-software/renovate/testcontainers.ver…
AB-xdev May 20, 2025
e4b6b9f
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev May 20, 2025
d2e43ad
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ hs_err_pid*
.idea/*
!.idea/saveactions_settings.xml
!.idea/checkstyle-idea.xml
!.idea/externalDependencies.xml

!.idea/inspectionProfiles/
.idea/inspectionProfiles/*
Expand Down
7 changes: 7 additions & 0 deletions .idea/externalDependencies.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.0.2
* Migrated deployment to _Sonatype Maven Central Portal_ [#155](https://github.com/xdev-software/standard-maven-template/issues/155)
* Updated dependencies

# 1.0.1
Do not include MariaDB JDBC adapter in ``compile`` scope.

Expand Down
58 changes: 10 additions & 48 deletions flyway-core-slim/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,47 +49,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<flyway.version>10.20.1</flyway.version>
<testcontainers.version>1.20.6</testcontainers.version>
<testcontainers.version>1.21.0</testcontainers.version>

<!-- by default run no tests as Docker is required -->
<skipTests>true</skipTests>
</properties>

<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>org.flywaydb</groupId>
Expand Down Expand Up @@ -263,7 +228,7 @@
</properties>
</profile>
<profile>
<id>ossrh</id>
<id>publish-sonatype-central-portal</id>
<build>
<plugins>
<plugin>
Expand Down Expand Up @@ -307,16 +272,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 @@ -334,7 +296,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 @@ -371,12 +333,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
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,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 @@ -81,12 +81,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