From 78bc9f9c8ffd836ab8d93eda0814bd6b25a6ccb8 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 23 Sep 2025 16:41:39 +0530
Subject: [PATCH 1/4] Update Maven workflow and versioning for publishing to
 Maven Central

---
 .github/workflows/maven--package-publish.yml |  7 +++-
 pom.xml                                      | 39 ++++++++------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/maven--package-publish.yml b/.github/workflows/maven--package-publish.yml
index ed2ad1d8..469a0548 100644
--- a/.github/workflows/maven--package-publish.yml
+++ b/.github/workflows/maven--package-publish.yml
@@ -1,6 +1,9 @@
 name: Publishing to Maven Packages
 #on: [ push ]  # Trigger the workflow when a push (commit) event occurs
 on:
+  push:
+    branches:
+      - fix/workflow-release
   release:
     types: [ created ]
 jobs:
@@ -24,8 +27,8 @@ jobs:
       - name: Publish to Maven Central Repository
         run: mvn --batch-mode -Dgpg.passphrase=${{ secrets.GPG_PASSPHRASE }} deploy
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
 #        run: mvn --batch-mode deploy
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1917c51b..f8d9eac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1-beta</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>
@@ -85,26 +85,24 @@
         </developer>
     </developers>
 
-    <distributionManagement>
+    <!-- <distributionManagement>
 
-        <!--         Maven Snapshot Repository -->
+                Maven Snapshot Repository
         <snapshotRepository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
-
-        <!--GitHub Packages-->
-        <!--        <snapshotRepository>-->
-        <!--            <id>github</id>-->
-        <!--            <url>https://maven.pkg.github.com/contentstack/contentstack-java</url>-->
-        <!--        </snapshotRepository>-->
-        <!--Maven Release Repository-->
+               <snapshotRepository>
+                   <id>github</id>
+                   <url>https://maven.pkg.github.com/contentstack/contentstack-java</url>
+               </snapshotRepository>
+        Maven Release Repository
         <repository>
             <id>ossrh</id>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
 
-    </distributionManagement>
+    </distributionManagement> -->
 
 
     <dependencies>
@@ -278,7 +276,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-                    <skipTests>true</skipTests>
+                    <!-- <skipTests>true</skipTests> -->
                 </configuration>
             </plugin>
 
@@ -328,19 +326,14 @@
             </plugin>
 
             <plugin>
-                <groupId>org.sonatype.plugins</groupId>
-                <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>${nexus-staging-maven-plugin.version}</version>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.8.0</version> <!-- or latest -->
                 <extensions>true</extensions>
-                <!--                <configuration>-->
-                <!--                    <serverId>github</serverId>-->
-                <!--                    <nexusUrl>https://maven.pkg.github.com/contentstack/contentstack-java</nexusUrl>-->
-                <!--                    <autoReleaseAfterClose>true</autoReleaseAfterClose>-->
-                <!--                </configuration>-->
                 <configuration>
-                    <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                    <autoReleaseAfterClose>true</autoReleaseAfterClose>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                    <waitUntil>published</waitUntil>
                 </configuration>
             </plugin>
             <!--

From 89f37e9c6f7825db1f8edebf43d4fe9b62ec4a95 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 23 Sep 2025 16:45:06 +0530
Subject: [PATCH 2/4] Enable skipping tests in Maven Surefire plugin
 configuration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f8d9eac7..0b3c0111 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,7 +276,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
                 <configuration>
-                    <!-- <skipTests>true</skipTests> -->
+                    <skipTests>true</skipTests>
                 </configuration>
             </plugin>
 

From d3fa3248585cc1ceb916c179f28b6f30f8be1d68 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 23 Sep 2025 16:47:42 +0530
Subject: [PATCH 3/4] Fix Maven server ID and revert version to 2.2.0-beta in
 POM file

---
 .github/workflows/maven--package-publish.yml | 2 +-
 pom.xml                                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven--package-publish.yml b/.github/workflows/maven--package-publish.yml
index 469a0548..1789f69e 100644
--- a/.github/workflows/maven--package-publish.yml
+++ b/.github/workflows/maven--package-publish.yml
@@ -19,7 +19,7 @@ jobs:
         with:
           java-version: '11'
           distribution: 'adopt'
-          server-id: ossrh
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
diff --git a/pom.xml b/pom.xml
index 0b3c0111..e125c4d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.2.1-beta</version>
+    <version>2.2.0-beta</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>

From d34dfb3e0aaa07940992ed0357a85e2215c326a3 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 23 Sep 2025 16:58:24 +0530
Subject: [PATCH 4/4] Update Maven workflow to trigger on release events and
 revert version to 2.2.0 in POM file

---
 .github/workflows/maven--package-publish.yml | 3 ---
 pom.xml                                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/maven--package-publish.yml b/.github/workflows/maven--package-publish.yml
index 1789f69e..ef515b1f 100644
--- a/.github/workflows/maven--package-publish.yml
+++ b/.github/workflows/maven--package-publish.yml
@@ -1,9 +1,6 @@
 name: Publishing to Maven Packages
 #on: [ push ]  # Trigger the workflow when a push (commit) event occurs
 on:
-  push:
-    branches:
-      - fix/workflow-release
   release:
     types: [ created ]
 jobs:
diff --git a/pom.xml b/pom.xml
index e125c4d9..a26af36b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>java</artifactId>
-    <version>2.2.0-beta</version>
+    <version>2.2.0</version>
     <packaging>jar</packaging>
     <name>contentstack-java</name>
     <description>Java SDK for Contentstack Content Delivery API</description>