From cbb8640c40e4f608fcb954de62a15d5ba4209240 Mon Sep 17 00:00:00 2001
From: Phillip Ross <phillip.w.g.ross@gmail.com>
Date: Sun, 1 Jun 2025 17:37:16 -0400
Subject: [PATCH 1/2] Build Fixes/Improvements - Update URLs to https

Signed-off-by: Phillip Ross <phillip.w.g.ross@gmail.com>
---
 pom.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 47f49be..97f3709 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,11 +9,11 @@
 
     <name>PostGIS Java Project</name>
     <description>Aggregates java projects associated with the PostGIS project.</description>
-    <url>http://postgis.net</url>
+    <url>https://postgis.net</url>
     <licenses>
         <license>
             <name>GNU Lesser General Public License</name>
-            <url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
+            <url>https://www.gnu.org/licenses/lgpl-2.1.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -21,7 +21,7 @@
     <developers>
         <developer>
             <name>PostGIS Development Team</name>
-            <url>http://postgis.net</url>
+            <url>https://postgis.net</url>
         </developer>
         <developer>
             <name>Phillip Ross</name>
@@ -35,7 +35,7 @@
         <contributor>
             <name>Hakan Tandogan</name>
             <email>hakan@gurkensalat.com</email>
-            <url>http://www.gurkensalat.com/</url>
+            <url>https://www.gurkensalat.com/</url>
             <roles>
                 <role>Maven Packager</role>
             </roles>
@@ -43,7 +43,6 @@
         <contributor>
             <name>Baris Ergun</name>
             <email>barisergun75@gmail.com</email>
-            <url>http://www.barisergun.com/</url>
             <roles>
                 <role>Maven Packager</role>
             </roles>
@@ -56,14 +55,14 @@
             <subscribe>postgis-users-subscribe@lists.osgeo.org</subscribe>
             <unsubscribe>postgis-users-unsubscribe@lists.osgeo.org</unsubscribe>
             <post>postgis-users@lists.osgeo.org</post>
-            <archive>http://lists.osgeo.org/pipermail/postgis-users/</archive>
+            <archive>https://lists.osgeo.org/pipermail/postgis-users/</archive>
         </mailingList>
         <mailingList>
             <name>Developer List</name>
             <subscribe>postgis-devel-subscribe@lists.osgeo.org</subscribe>
             <unsubscribe>postgis-devel-unsubscribe@lists.osgeo.org</unsubscribe>
             <post>postgis-devel@lists.osgeo.org</post>
-            <archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
+            <archive>https://lists.osgeo.org/pipermail/postgis-devel/</archive>
         </mailingList>
     </mailingLists>
 
@@ -88,7 +87,7 @@
     <distributionManagement>
         <site>
             <id>local-staging-site</id>
-            <url>http://local-staging/</url>
+            <url>https://local-staging/</url>
         </site>
     </distributionManagement>
 

From d3983e390f569c6a633c1ff26253cd35f7716ef4 Mon Sep 17 00:00:00 2001
From: Phillip Ross <phillip.w.g.ross@gmail.com>
Date: Mon, 2 Jun 2025 09:58:03 -0400
Subject: [PATCH 2/2] Migrate from OSSRH publishing to Sonatype Central Portal
 publishing

---
 .github/settings.xml       | 41 ++++++---------------------------
 .github/workflows/main.yml |  6 ++---
 pom.xml                    | 47 +++++++++++++++++++++++++-------------
 3 files changed, 41 insertions(+), 53 deletions(-)

diff --git a/.github/settings.xml b/.github/settings.xml
index 4774930..a8bb47f 100644
--- a/.github/settings.xml
+++ b/.github/settings.xml
@@ -3,9 +3,9 @@
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
     <servers>
         <server>
-            <id>ossrh</id>
-            <username>${env.OSSRHU}</username>
-            <password>${env.OSSRHT}</password>
+            <id>sonatype-central-portal</id>
+            <username>${env.SONATYPE_CENTRAL_PORTAL_REPO_USERNAME}</username>
+            <password>${env.SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD}</password>
         </server>
     </servers>
     <profiles>
@@ -16,44 +16,17 @@
             </properties>
         </profile>
         <profile>
-            <id>sonatype-snapshots</id>
+            <id>sonatype-central-snapshots</id>
             <repositories>
                 <repository>
-                    <id>sonatype-snapshots</id>
+                    <id>sonatype-central-snapshots</id>
                     <snapshots>
                         <enabled>true</enabled>
                     </snapshots>
-                    <name>sonatype-snapshots</name>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>sonatype-staging</id>
-            <repositories>
-                <repository>
-                    <id>sonatype-staging</id>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <name>sonatype-staging</name>
-                    <url>https://oss.sonatype.org/content/groups/staging/</url>
-                </repository>
-            </repositories>
-        </profile>
-        <profile>
-            <id>sonatype-releases</id>
-            <repositories>
-                <repository>
-                    <id>sonatype-releases</id>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <name>sonatype-releases</name>
-                    <url>https://oss.sonatype.org/content/groups/public/</url>
+                    <name>sonatype-central-snapshots</name>
+                    <url>https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/snapshots/</url>
                 </repository>
             </repositories>
         </profile>
     </profiles>
-
 </settings>
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e19b390..5eaf037 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       MAVEN_PROPS: -Djavadoc.path=`which javadoc`
-      PROFILES: gpg,release-sign-artifacts,sonatype-deployment,sonatype-snapshots,sonatype-staging,sonatype-releases
+      PROFILES: "gpg,release-sign-artifacts,sonatype-central-portal-deployment,sonatype-central-snapshots"
       SETTINGS: .github/settings.xml
 
     steps:
@@ -82,8 +82,8 @@ jobs:
     - name: Maven deploy
       if: ${{ matrix.maven_deploy && (github.ref == 'refs/heads/main') && (github.event_name != 'pull_request')  }}
       env:
-        OSSRHU: ${{ secrets.OSSRHU }}
-        OSSRHT: ${{ secrets.OSSRHT }}
+        SONATYPE_CENTRAL_PORTAL_REPO_USERNAME: ${{ secrets.SONATYPE_CENTRAL_PORTAL_REPO_USERNAME }}
+        SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD }}
       run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} deploy
 
     - name: Docker maven build
diff --git a/pom.xml b/pom.xml
index 97f3709..54face2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -461,7 +461,7 @@
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                         <localCheckout>true</localCheckout>
                         <pushChanges>false</pushChanges>
-                        <releaseProfiles>release-sign-artifacts,sonatype-deployment</releaseProfiles>
+                        <releaseProfiles>release-sign-artifacts,sonatype-central-portal-deployment</releaseProfiles>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -859,10 +859,10 @@
             </build>
         </profile>
         <!--
-        The release-sign-artifacts and sonatype deployment profiles only need activated when pushing snapshots or
-        releases to maven central.  When enabled, additional artifacts will be generated for javadoc and source as well
-        as GPG signatures for each artifact.  This profiles assume that the properties for the gpg plugin
-        (such as gpg.keyname and gpg.passphrase are either defined in a settings.xml file or similar facility.
+        The release-sign-artifacts and sonatype-central-portal-deployment profiles only need activated when pushing
+        snapshots or releases to maven central.  When enabled, additional artifacts will be generated for javadoc and
+        source as well as GPG signatures for each artifact.  These profiles assume that the properties for the gpg
+        plugin (such as gpg.keyname and gpg.passphrase) are either defined in a settings.xml file or similar facility.
         -->
         <profile>
             <id>release-sign-artifacts</id>
@@ -909,17 +909,32 @@
             </build>
         </profile>
         <profile>
-            <id>sonatype-deployment</id>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
+            <id>sonatype-central-portal-deployment</id>
+            <properties>
+                <central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
+            </properties>
+            <build>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.sonatype.central</groupId>
+                            <artifactId>central-publishing-maven-plugin</artifactId>
+                            <version>${central-publishing-maven-plugin.version}</version>
+                            <extensions>true</extensions>
+                            <configuration>
+                                <!-- publishing server id refers to <id> element in <server> section of settings.xml -->
+                                <publishingServerId>sonatype-central-portal</publishingServerId>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>