Merge pull request #27 from liubao68/main

prepare new version 1.0.1-SNAPSHOT

Author: liubao68

ci/build-and-deploy-to-maven-central.sh

@@ -1,39 +1,12 @@
 #!/bin/bash
 
-set -euo pipefail
-
-VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version -o | grep -v INFO)
-
-if [[ $VERSION =~ [^.*-SNAPSHOT$] ]] ; then
-
-  echo "Cannot deploy a snapshot: $VERSION"
-  exit 1
-fi
-
-if [[ $VERSION =~ [^(\d+\.)+(RC(\d+)|M(\d+)|RELEASE)$] ]] ; then
-
-  #
-  # Prepare GPG Key is expected to be in base64
-  # Exported with gpg -a --export-secret-keys "your@email" | base64 > gpg.base64
-  #
-  printf "$GPG_KEY_BASE64" | base64 --decode > gpg.asc
-  echo ${GPG_PASSPHRASE} | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
-  gpg -k
-
-  #
-  # Stage on Maven Central
-  #
-  echo "Staging $VERSION to Maven Central"
-
-  ./mvnw \
-      -s settings.xml \
-      -Pcentral \
-      -Dmaven.test.skip=true \
-      -Dgpg.passphrase=${GPG_PASSPHRASE} \
-      clean deploy -B -D skipITs
-else
-
-  echo "Not a release: $VERSION"
-  exit 1
-fi
-
+printf "$GPG_KEY_BASE64" | base64 --decode > gpg.asc
+echo ${GPG_PASSPHRASE} | gpg --batch --yes --passphrase-fd 0 --import gpg.asc
+gpg -k
+
+./mvnw \
+    -s settings.xml \
+    -Pcentral \
+    -Dmaven.test.skip=true \
+    -Dgpg.passphrase=${GPG_PASSPHRASE} \
+    clean deploy -B -D skipITs

pom.xml

@@ -24,7 +24,7 @@
 
     <groupId>com.huaweicloud.gaussdb</groupId>
     <artifactId>gaussdb-r2dbc</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Reactive Relational Database Connectivity - GaussDB</name>
@@ -579,17 +579,15 @@
                         </plugin>
 
                         <!-- Deploy to Sonatype OSS Nexus -->
-
                         <plugin>
-                            <groupId>org.sonatype.plugins</groupId>
-                            <artifactId>nexus-staging-maven-plugin</artifactId>
-                            <version>1.6.13</version>
+                            <groupId>org.sonatype.central</groupId>
+                            <artifactId>central-publishing-maven-plugin</artifactId>
+                            <version>0.8.0</version>
                             <extensions>true</extensions>
                             <configuration>
-                                <serverId>sonatype</serverId>
-                                <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                                <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                                <keepStagingRepositoryOnFailure>true</keepStagingRepositoryOnFailure>
+                                <publishingServerId>central</publishingServerId>
+                                <autoPublish>true</autoPublish>
+                                <waitUntil>published</waitUntil>
                             </configuration>
                         </plugin>
                     </plugins>
@@ -604,21 +602,14 @@
                     </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>
 
             </build>
 
-            <distributionManagement>
-                <repository>
-                    <id>sonatype</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
-
         </profile>
 
     </profiles>

settings.xml

@@ -4,7 +4,7 @@
 
 	<servers>
 		<server>
-			<id>sonatype</id>
+			<id>central</id>
 			<username>${env.SONATYPE_USER}</username>
 			<password>${env.SONATYPE_PASSWORD}</password>
 		</server>