Skip to content

Commit d3ea86f

Browse files
authored
Merge pull request #41 from spt-development/feature/spring-boot-3.5.0-upgrade
Updated dependencies to align with Spring Boot 3.5.0
2 parents 459a4b0 + 5e16918 commit d3ea86f

File tree

4 files changed

+27
-32
lines changed

4 files changed

+27
-32
lines changed

.github/maven-settings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
<servers>
77
<server>
8-
<id>ossrh</id>
9-
<username>${env.OSSRH_USERNAME}</username>
10-
<password>${env.OSSRH_PASSWORD}</password>
8+
<id>central</id>
9+
<username>${env.CENTRAL_USERNAME}</username>
10+
<password>${env.CENTRAL_PASSWORD}</password>
1111
</server>
1212
<server>
1313
<id>github.com</id>
@@ -17,13 +17,13 @@
1717
</servers>
1818
<profiles>
1919
<profile>
20-
<id>ossrh</id>
20+
<id>central</id>
2121
<activation>
2222
<activeByDefault>true</activeByDefault>
2323
</activation>
2424
<properties>
2525
<gpg.executable>gpg</gpg.executable>
2626
</properties>
27-
</profile>
27+
</profile>
2828
</profiles>
2929
</settings>

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ jobs:
6464
- name: Create release
6565
run: ./mvnw --settings .github/maven-settings.xml release:prepare release:perform -DskipTests -Prelease -B
6666
env:
67-
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
68-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
67+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
68+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
6969
GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
7070
GIT_HUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
7171
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Dependencies
2+
3+
* Aligned dependencies with [Spring Boot 3.5.0](https://github.com/spring-projects/spring-boot/releases/tag/v3.5.0)

pom.xml

Lines changed: 17 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,20 @@
4141
<aspectj.version>1.9.24</aspectj.version>
4242
<httpcore5.version>5.3.4</httpcore5.version>
4343
<slf4j.version>2.0.17</slf4j.version>
44-
<spring.version>6.2.6</spring.version>
44+
<spring.version>6.2.7</spring.version>
4545

4646
<!-- Test dependency versions -->
47-
<spt-development-test.version>3.1.17</spt-development-test.version>
47+
<spt-development-test.version>3.1.18</spt-development-test.version>
4848

4949
<!-- Test dependency versions, matched to Spring Boot -->
50-
<hamcrest.version>2.2</hamcrest.version>
51-
<junit-jupiter.version>5.11.4</junit-jupiter.version>
50+
<hamcrest.version>3.0</hamcrest.version>
51+
<junit-jupiter.version>5.12.1</junit-jupiter.version>
5252
<logback.version>1.5.18</logback.version>
53-
<mockito.version>5.14.2</mockito.version>
53+
<mockito.version>5.17.0</mockito.version>
5454

5555
<!-- Plugin versions -->
5656
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
57+
<central-publishing-plugin.version>0.7.0</central-publishing-plugin.version>
5758
<checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
5859
<dependency-check-maven.version>12.1.1</dependency-check-maven.version>
5960
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
@@ -69,16 +70,15 @@
6970
<maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
7071
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
7172
<maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
72-
<nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
73-
<pitest-maven.version>1.19.1</pitest-maven.version>
73+
<pitest-maven.version>1.19.4</pitest-maven.version>
7474
<spotbugs.version>4.9.3.0</spotbugs.version>
7575
<versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
7676

7777
<!-- Plugin dependencies -->
78-
<checkstyle.version>10.23.1</checkstyle.version>
78+
<checkstyle.version>10.24.0</checkstyle.version>
7979
<findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
8080
<findbugs-sec-bug-pattern.version>1.14.0</findbugs-sec-bug-pattern.version>
81-
<pitest-junit5-plugin.version>1.2.2</pitest-junit5-plugin.version>
81+
<pitest-junit5-plugin.version>1.2.3</pitest-junit5-plugin.version>
8282
<pmd.version>7.13.0</pmd.version>
8383
</properties>
8484

@@ -283,9 +283,9 @@
283283
</dependencies>
284284
</plugin>
285285
<plugin>
286-
<groupId>org.sonatype.plugins</groupId>
287-
<artifactId>nexus-staging-maven-plugin</artifactId>
288-
<version>${nexus-staging-plugin.version}</version>
286+
<groupId>org.sonatype.central</groupId>
287+
<artifactId>central-publishing-maven-plugin</artifactId>
288+
<version>${central-publishing-plugin.version}</version>
289289
</plugin>
290290
</plugins>
291291
</pluginManagement>
@@ -779,13 +779,13 @@
779779
<!-- Version defined in pluginManagement section -->
780780
</plugin>
781781
<plugin>
782-
<groupId>org.sonatype.plugins</groupId>
783-
<artifactId>nexus-staging-maven-plugin</artifactId>
782+
<groupId>org.sonatype.central</groupId>
783+
<artifactId>central-publishing-maven-plugin</artifactId>
784784
<extensions>true</extensions>
785785
<configuration>
786-
<serverId>ossrh</serverId>
787-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
788-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
786+
<publishingServerId>central</publishingServerId>
787+
<autoPublish>true</autoPublish>
788+
<waitUntil>published</waitUntil>
789789
</configuration>
790790
<!-- Version defined in pluginManagement section -->
791791
</plugin>
@@ -816,13 +816,5 @@
816816
<id>github</id>
817817
<url>https://github.com/spt-development/spt-development-logging-spring</url>
818818
</site>
819-
<repository>
820-
<id>ossrh</id>
821-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
822-
</repository>
823-
<snapshotRepository>
824-
<id>ossrh</id>
825-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
826-
</snapshotRepository>
827819
</distributionManagement>
828820
</project>

0 commit comments

Comments
 (0)