From 52f9b5a6a465feba671ff45005485b5621947381 Mon Sep 17 00:00:00 2001
From: Simon Taylor <simon.taylor@spt-development.com>
Date: Sat, 24 May 2025 15:21:54 +0100
Subject: [PATCH 1/2] Migration from OSSRH to Central Portal

---
 .github/maven-settings.xml               | 10 ++++-----
 .github/workflows/build.yml              |  4 ++--
 documentation/releases/release-3.1.18.md |  3 +++
 pom.xml                                  | 26 ++++++++----------------
 4 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100644 documentation/releases/release-3.1.18.md

diff --git a/.github/maven-settings.xml b/.github/maven-settings.xml
index e71dc59..d26ffb9 100644
--- a/.github/maven-settings.xml
+++ b/.github/maven-settings.xml
@@ -5,9 +5,9 @@
 
     <servers>
         <server>
-            <id>ossrh</id>
-            <username>${env.OSSRH_USERNAME}</username>
-            <password>${env.OSSRH_PASSWORD}</password>
+            <id>central</id>
+            <username>${env.CENTRAL_USERNAME}</username>
+            <password>${env.CENTRAL_PASSWORD}</password>
         </server>
         <server>
             <id>github.com</id>
@@ -17,13 +17,13 @@
     </servers>
     <profiles>
         <profile>
-            <id>ossrh</id>
+            <id>central</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
                 <gpg.executable>gpg</gpg.executable>
             </properties>
-       </profile>
+        </profile>
     </profiles>
 </settings>
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 47c8ad4..b3b64b3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -64,8 +64,8 @@ jobs:
       - name: Create release
         run: ./mvnw --settings .github/maven-settings.xml release:prepare release:perform -DskipTests -Prelease -B
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          CENTRAL_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          CENTRAL_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
           GIT_HUB_USERNAME: ${{ secrets.GIT_HUB_USERNAME }}
           GIT_HUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
diff --git a/documentation/releases/release-3.1.18.md b/documentation/releases/release-3.1.18.md
new file mode 100644
index 0000000..8aa0380
--- /dev/null
+++ b/documentation/releases/release-3.1.18.md
@@ -0,0 +1,3 @@
+## Dependencies
+
+* Aligned dependencies with [Spring Boot 3.5.0](https://github.com/spring-projects/spring-boot/releases/tag/v3.5.0)
diff --git a/pom.xml b/pom.xml
index 85c23ae..67a0e42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
 
         <!-- Plugin versions -->
         <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
+        <central-publishing-plugin.version>0.7.0</central-publishing-plugin.version>
         <checkstyle-maven-plugin.version>3.6.0</checkstyle-maven-plugin.version>
         <dependency-check-maven.version>12.1.1</dependency-check-maven.version>
         <license-maven-plugin.version>2.5.0</license-maven-plugin.version>
@@ -65,7 +66,6 @@
         <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
         <maven-scm-plugin.version>2.1.0</maven-scm-plugin.version>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-        <nexus-staging-plugin.version>1.7.0</nexus-staging-plugin.version>
         <spotbugs.version>4.9.3.0</spotbugs.version>
         <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
 
@@ -225,9 +225,9 @@
                     <version>${license-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>${nexus-staging-plugin.version}</version>
+                    <groupId>org.sonatype.central</groupId>
+                    <artifactId>central-publishing-maven-plugin</artifactId>
+                    <version>${central-publishing-plugin.version}</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -618,13 +618,13 @@
                         <!-- Version defined in pluginManagement section -->
                     </plugin>
                     <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
                         <extensions>true</extensions>
                         <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                            <waitUntil>published</waitUntil>
                         </configuration>
                         <!-- Version defined in pluginManagement section -->
                     </plugin>
@@ -655,13 +655,5 @@
             <id>github</id>
             <url>https://github.com/spt-development/spt-development-test</url>
         </site>
-        <repository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
     </distributionManagement>
 </project>

From c810122347c3cb5e5057ff5cb6fd0a89f051d8d1 Mon Sep 17 00:00:00 2001
From: Simon Taylor <simon.taylor@spt-development.com>
Date: Sat, 24 May 2025 16:05:15 +0100
Subject: [PATCH 2/2] Updated dependencies to align with Spring Boot 3.5.0

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 67a0e42..bdfdfcd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,15 +40,15 @@
 
         <!-- Dependency versions, matched to Spring Boot -->
         <commons-lang.version>3.17.0</commons-lang.version>
-        <hamcrest.version>2.2</hamcrest.version>
+        <hamcrest.version>3.0</hamcrest.version>
         <httpcore5.version>5.3.4</httpcore5.version>
-        <httpclient5.version>5.4.3</httpclient5.version>
+        <httpclient5.version>5.4.4</httpclient5.version>
         <jakarta-jms.version>3.1.0</jakarta-jms.version>
-        <junit-jupiter.version>5.11.4</junit-jupiter.version>
+        <junit-jupiter.version>5.12.2</junit-jupiter.version>
         <logback.version>1.5.18</logback.version>
-        <mockito.version>5.14.2</mockito.version>
+        <mockito.version>5.17.0</mockito.version>
         <slf4j.version>2.0.17</slf4j.version>
-        <spring.version>6.2.6</spring.version>
+        <spring.version>6.2.7</spring.version>
 
         <!-- Plugin versions -->
         <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
@@ -70,7 +70,7 @@
         <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
 
         <!-- Plugin dependencies -->
-        <checkstyle.version>10.23.1</checkstyle.version>
+        <checkstyle.version>10.24.0</checkstyle.version>
         <findbugs-slf4j-bug-pattern.version>1.5.0</findbugs-slf4j-bug-pattern.version>
         <findbugs-sec-bug-pattern.version>1.14.0</findbugs-sec-bug-pattern.version>
         <pmd.version>7.13.0</pmd.version>