Switch to Sonatype Central Publishing.

mp911de · mp911de · commit e8dd6223c200 · 2025-09-01T11:54:16.000+02:00
[resolves #681]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,15 +12,15 @@ jobs:
     if: github.repository == 'pgjdbc/r2dbc-postgresql'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - name: Set up Java
+        uses: actions/setup-java@v5
         with:
-          java-version: 8
+          java-version: 24
           distribution: temurin
           cache: maven
       - name: Build with Maven
         env:
-          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
         run: ./mvnw -B deploy -D skipITs -P snapshot -s settings.xml
diff --git a/.github/workflows/pullrequests.yml b/.github/workflows/pullrequests.yml
@@ -9,11 +9,11 @@ jobs:
   pr-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - name: Set up Java
+        uses: actions/setup-java@v5
         with:
-          java-version: 8
+          java-version: 24
           distribution: temurin
           cache: maven
       - name: Build with Maven
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,20 +12,20 @@ jobs:
     if: github.repository == 'pgjdbc/r2dbc-postgresql'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v5
+      - name: Set up Java
+        uses: actions/setup-java@v5
         with:
-          java-version: 8
+          java-version: 24
           distribution: temurin
       - name: Initialize Maven Version
         run: ./mvnw -q org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version
       - name: GPG Check
         run: gpg -k
       - name: Release with Maven
         env:
-          SONATYPE_USER: ${{ secrets.SONATYPE_USER }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          CENTRAL_TOKEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
+          CENTRAL_TOKEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
           GPG_KEY_BASE64: ${{ secrets.GPG_KEY_BASE64 }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         run: ci/build-and-deploy-to-maven-central.sh
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# PostgreSQL R2DBC Driver [![Java CI with Maven](https://github.com/pgjdbc/r2dbc-postgresql/workflows/Java%20CI%20with%20Maven/badge.svg?branch=main)](https://github.com/pgjdbc/r2dbc-postgresql/actions?query=workflow%3A%22Java+CI+with+Maven%22+branch%3Amain) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.postgresql/r2dbc-postgresql/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.postgresql/r2dbc-postgresql)
+# PostgreSQL R2DBC Driver [![Java CI with Maven](https://github.com/pgjdbc/r2dbc-postgresql/actions/workflows/ci.yml/badge.svg)](https://github.com/pgjdbc/r2dbc-postgresql/actions/workflows/ci.yml) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.postgresql/r2dbc-postgresql/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.postgresql/r2dbc-postgresql)
 
 This project contains the [PostgreSQL][p] implementation of the [R2DBC SPI][r].  This implementation is not intended to be used directly, but rather to be used as the backing implementation for a humane client library to delegate to.
 
@@ -148,7 +148,7 @@ Binding also allowed positional index (zero-based) references.  The parameter in
 
 ### Maven configuration
 
-Artifacts can be found on [Maven Central](https://search.maven.org/search?q=r2dbc-postgresql).
+Artifacts can be found on [Maven Central](https://central.sonatype.com/search?q=r2dbc-postgresql).
 
 ```xml
 <dependency>
@@ -168,9 +168,9 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 </dependency>
 
 <repository>
-<id>sonatype-nexus-snapshots</id>
-<name>Sonatype OSS Snapshot Repository</name>
-<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+  <id>central-portal-snapshots</id>
+  <name>Central Portal Snapshots</name>
+  <url>https://central.sonatype.com/repository/maven-snapshots/</url>
 </repository>
 ```
 
diff --git a/ci/build-and-deploy-to-maven-central.sh b/ci/build-and-deploy-to-maven-central.sh
@@ -23,7 +23,7 @@ if [[ $VERSION =~ [^(\d+\.)+(RC(\d+)|M(\d+)|RELEASE)$] ]] ; then
   #
   # Stage on Maven Central
   #
-  echo "Staging $VERSION to Maven Central"
+  echo "Staging $VERSION to Central Portal"
 
   ./mvnw \
       -s settings.xml \
diff --git a/pom.xml b/pom.xml
@@ -272,8 +272,7 @@
                         <arg>-Xlint:-serial</arg>
                     </compilerArgs>
                     <showWarnings>true</showWarnings>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <release>8</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -332,6 +331,8 @@
                         <link>https://projectreactor.io/docs/core/release/api/</link>
                         <link>https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/</link>
                     </links>
+                    <doclint>-missing</doclint>
+                    <javadocVersion>1.8</javadocVersion>
                 </configuration>
                 <executions>
                     <execution>
@@ -426,6 +427,15 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                </configuration>
+            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -539,12 +549,14 @@
 
         <profile>
             <id>snapshot</id>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>sonatype</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-            </distributionManagement>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
         </profile>
 
         <profile>
@@ -576,20 +588,6 @@
                             </executions>
                         </plugin>
 
-                        <!-- Deploy to Sonatype OSS Nexus -->
-
-                        <plugin>
-                            <groupId>org.sonatype.plugins</groupId>
-                            <artifactId>nexus-staging-maven-plugin</artifactId>
-                            <version>1.6.13</version>
-                            <extensions>true</extensions>
-                            <configuration>
-                                <serverId>sonatype</serverId>
-                                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                                <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                                <keepStagingRepositoryOnFailure>true</keepStagingRepositoryOnFailure>
-                            </configuration>
-                        </plugin>
                     </plugins>
 
                 </pluginManagement>
@@ -602,8 +600,8 @@
                     </plugin>
 
                     <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
+                        <groupId>org.sonatype.central</groupId>
+                            <artifactId>central-publishing-maven-plugin</artifactId>
                     </plugin>
 
                 </plugins>
diff --git a/settings.xml b/settings.xml
@@ -4,9 +4,9 @@
 
 	<servers>
 		<server>
-			<id>sonatype</id>
-			<username>${env.SONATYPE_USER}</username>
-			<password>${env.SONATYPE_PASSWORD}</password>
+			<id>central</id>
+			<username>${env.CENTRAL_TOKEN_USERNAME}</username>
+			<password>${env.CENTRAL_TOKEN_PASSWORD}</password>
 		</server>
 	</servers>
 </settings>

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip`
	`1`	`+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip`
`2`	`2`	`wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ if [[ $VERSION =~ [^(\d+\.)+(RC(\d+)\|M(\d+)\|RELEASE)$] ]] ; then`
`23`	`23`	`#`
`24`	`24`	`# Stage on Maven Central`
`25`	`25`	`#`
`26`		`- echo "Staging $VERSION to Maven Central"`
	`26`	`+ echo "Staging $VERSION to Central Portal"`
`27`	`27`
`28`	`28`	`./mvnw \`
`29`	`29`	`-s settings.xml \`