From f9b5fd7c09819005b73d826cc9910a5b3655a791 Mon Sep 17 00:00:00 2001
From: pkryshtop <97191009+sl-pkryshtop@users.noreply.github.com>
Date: Wed, 6 Aug 2025 17:53:03 +0300
Subject: [PATCH] fix: deploy to Central Publisher Portal instead of sonatype
 OSSRH (#120)

Co-authored-by: pkryshtop <pkryshtop@smartling@com>
---
 .circleci/config.yml   |  4 +++-
 .circleci/release.sh   | 11 ++++++++++-
 .circleci/settings.xml |  6 +++---
 pom.xml                | 45 ++++++++++++++++++++++++++++++++++++++----
 4 files changed, 57 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ce72f20..fe60771c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,4 +49,6 @@ workflows:
                       - test
                   filters:
                       branches:
-                          only: master
+                          only:
+                              - master
+                              - deploy-test
diff --git a/.circleci/release.sh b/.circleci/release.sh
index 9099d2ca..3ac297ac 100755
--- a/.circleci/release.sh
+++ b/.circleci/release.sh
@@ -9,4 +9,13 @@ if ! ./mvnw -Prelease conventional-commits:validate; then
 fi
 
 ./mvnw -B -Prelease -DskipTests -Darguments='-DskipTests' -s .circleci/settings.xml conventional-commits:version release:prepare
-./mvnw -B -DskipTests -Darguments=-DskipTests -s .circleci/settings.xml release:perform
+
+# Get the tag created by release:prepare
+TAG=$(git describe --tags --abbrev=0)
+echo "Deploying tag: $TAG"
+
+# Checkout the tagged version
+git checkout $TAG
+
+# Deploy using central-publishing-maven-plugin
+./mvnw -B -Prelease -DskipTests -s .circleci/settings.xml clean deploy
diff --git a/.circleci/settings.xml b/.circleci/settings.xml
index ad95e21c..3051899c 100644
--- a/.circleci/settings.xml
+++ b/.circleci/settings.xml
@@ -18,9 +18,9 @@
 
   <servers>
     <server>
-      <id>sonatype-oss-staging</id>
-      <username>${env.SONATYPE_USERNAME}</username>
-      <password>${env.SONATYPE_PASSWORD}</password>
+      <id>central</id>
+      <username>${env.CENTRAL_SONATYPE_USERNAME}</username>
+      <password>${env.CENTRAL_SONATYPE_PASSWORD}</password>
     </server>
   </servers>
 </settings>
diff --git a/pom.xml b/pom.xml
index 32f461f0..c59381c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,10 +207,6 @@
     </developers>
 
     <distributionManagement>
-        <repository>
-            <id>sonatype-oss-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-        </repository>
         <snapshotRepository>
             <id>github</id>
             <url>https://maven.pkg.github.com/smartling/java-api-sdk</url>
@@ -238,6 +234,47 @@
                             <tagNameFormat>v@{project.version}</tagNameFormat>
                             <allowTimestampedSnapshots>false</allowTimestampedSnapshots>
                             <scmCommentPrefix xml:space="preserve">ci: </scmCommentPrefix>
+                            <!-- Skip release:perform goal - use central-publishing-maven-plugin instead -->
+                            <goals>prepare</goals>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals>
+                                    <goal>jar-no-fork</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.1.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </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>
+                            <autoPublish>false</autoPublish>
+                            <waitUntil>uploaded</waitUntil>
+                            <checksums>required</checksums>
+                            <deploymentName>Java API SDK (${project.version})</deploymentName>
                         </configuration>
                     </plugin>
                 </plugins>