From 87b10a9fae2a4e2c0bda5131caf5eb24ce641617 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 12:19:41 +0530
Subject: [PATCH 1/7] fixes for spring framework version with java 8

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

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index add35be..24ba560 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
           server-id: ossrh
           server-username: MAVEN_USERNAME
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Java for publishing to GitHub Packages
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '8'
           distribution: 'adopt'
           server-id: github
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
diff --git a/pom.xml b/pom.xml
index 7d305bb..9a99bdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.13</version>
+    <version>1.2.15-beta.1</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>
@@ -28,7 +28,7 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <validation-version>2.0.1.Final</validation-version>
         <json-version>20250107</json-version>
-        <spring-web-version>6.2.1</spring-web-version>
+        <spring-web-version>6.1.12</spring-web-version>
         <org.apache.commons-text>1.13.0</org.apache.commons-text>
     </properties>
 
@@ -242,6 +242,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

From 814640d65c7647a2272f9d82cfa79aee6f7a9b43 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 12:38:50 +0530
Subject: [PATCH 2/7] fix sca scan

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

diff --git a/pom.xml b/pom.xml
index 9a99bdd..83216c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <validation-version>2.0.1.Final</validation-version>
         <json-version>20250107</json-version>
-        <spring-web-version>6.1.12</spring-web-version>
+        <spring-web-version>6.1.14</spring-web-version>
         <org.apache.commons-text>1.13.0</org.apache.commons-text>
     </properties>
 

From d38a8465614635d30595957636b345266271c4a4 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 15:20:14 +0530
Subject: [PATCH 3/7] testing workflow 1

---
 .github/workflows/maven-publish.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 24ba560..ac807e3 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -1,7 +1,7 @@
 name: Publish package to the Maven Central Repository
 on:
-  release:
-    types: [ created ]
+  push:
+    branches: fix/DX-2237-maven-publish-workflow
 jobs:
   publish-maven:
     runs-on: ubuntu-latest

From 0036a2ae2a1172d41e1a5c28577ac4a03e53693f Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 15:37:05 +0530
Subject: [PATCH 4/7] fix 2 upgrading java version to 17

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

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index ac807e3..bd7ae92 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Set up Maven Central Repository
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: ossrh
           server-username: MAVEN_USERNAME
diff --git a/pom.xml b/pom.xml
index 83216c7..5c68c4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <validation-version>2.0.1.Final</validation-version>
         <json-version>20250107</json-version>
-        <spring-web-version>6.1.14</spring-web-version>
+        <spring-web-version>6.2.1</spring-web-version>
         <org.apache.commons-text>1.13.0</org.apache.commons-text>
     </properties>
 
@@ -125,7 +125,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.5</version>
+                <version>0.8.8</version>
                 <executions>
                     <execution>
                         <goals>
@@ -193,7 +193,7 @@
                             <additionalOptions>-Xdoclint:none</additionalOptions>
                             <use>false</use>
                             <use>false</use>
-                            <source>1.8</source>
+                            <source>17</source>
                             <links>
                                 <link>http://docs.oracle.com/javase/8/docs/api/</link>
                                 <link>http://docs.oracle.com/javase/8/docs/api/</link>
@@ -242,10 +242,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>17</release>
                     <!--                    <executable>${JAVA_HOME}/bin/javac</executable>-->
                 </configuration>
             </plugin>

From 08433f25f7869c465ee339329548a99039c30d0b Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 15:40:35 +0530
Subject: [PATCH 5/7] test 3

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

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index bd7ae92..fc470fb 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Java for publishing to GitHub Packages
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'adopt'
           server-id: github
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
diff --git a/pom.xml b/pom.xml
index 5c68c4a..676726b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.15-beta.1</version>
+    <version>1.2.15-beta.2</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>

From 93286c80400146ba8ab135c773fb7dd30bf71bcf Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 15:47:52 +0530
Subject: [PATCH 6/7] workflow updated

---
 .github/workflows/maven-publish.yml | 4 ++--
 Changelog.md                        | 5 +++--
 pom.xml                             | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index fc470fb..bd74108 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -1,7 +1,7 @@
 name: Publish package to the Maven Central Repository
 on:
-  push:
-    branches: fix/DX-2237-maven-publish-workflow
+  release:
+    types: [created]
 jobs:
   publish-maven:
     runs-on: ubuntu-latest
diff --git a/Changelog.md b/Changelog.md
index 766ef43..550e08f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,11 +1,12 @@
 # Changelog
 
 A brief description of what changes project contains
-## Jan 20, 2025
+## Mar 17, 2025
 
-#### v1.2.13
+#### v1.2.15
 
 - Fix: Snyk issues
+- Fix: Publish workflows
 
 ## Oct 21, 2024
 
diff --git a/pom.xml b/pom.xml
index 676726b..e69258f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.contentstack.sdk</groupId>
     <artifactId>utils</artifactId>
-    <version>1.2.15-beta.2</version>
+    <version>1.2.15</version>
     <packaging>jar</packaging>
     <name>Contentstack-utils</name>
     <description>Java Utils SDK for Contentstack Content Delivery API, Contentstack is a headless CMS</description>

From b827423f0fd01aa0ab6b9673772b0de4af93c28c Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Tue, 11 Mar 2025 16:20:30 +0530
Subject: [PATCH 7/7] snyk fix

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

diff --git a/pom.xml b/pom.xml
index e69258f..885a39e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
         <validation-version>2.0.1.Final</validation-version>
         <json-version>20250107</json-version>
-        <spring-web-version>6.2.1</spring-web-version>
+        <spring-web-version>6.2.2</spring-web-version>
         <org.apache.commons-text>1.13.0</org.apache.commons-text>
     </properties>