From f774239ebcd72d73decc9c809088b00586945805 Mon Sep 17 00:00:00 2001
From: itsKedar <37594766+itsKedar@users.noreply.github.com>
Date: Fri, 18 Nov 2022 12:41:47 +0530
Subject: [PATCH 1/3] Vulnerabilities fix

---
 pom.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae2646f4..b0758cfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.6</version>
+		<version>2.6.13</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.github.checkmarx-ltd</groupId>
@@ -40,6 +40,11 @@
 			<artifactId>httpclient</artifactId>
 			<version>4.5.13</version>
 		</dependency>
+		<dependency>
+			<groupId>org.yaml</groupId>
+			<artifactId>snakeyaml</artifactId>
+			<version>1.33</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-compress</artifactId>
@@ -68,7 +73,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.8.8</version>
+			<version>2.8.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

From d0a05bbe94ab2ff189ad2e21ce3acc95751463f4 Mon Sep 17 00:00:00 2001
From: itsKedar <37594766+itsKedar@users.noreply.github.com>
Date: Fri, 18 Nov 2022 12:42:10 +0530
Subject: [PATCH 2/3] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index b0758cfc..0f66a43c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<artifactId>cx-spring-boot-sdk</artifactId>
 
 
-	<version>0.5.29</version>
+	<version>0.5.30</version>
 
 
 	<name>cx-spring-boot-sdk</name>

From 7c79ecb59b5ac81a0a73cda56f02d3b2820cd8ff Mon Sep 17 00:00:00 2001
From: satyamchaurasiapersistent
 <102941840+satyamchaurasiapersistent@users.noreply.github.com>
Date: Sun, 20 Nov 2022 12:43:39 +0530
Subject: [PATCH 3/3] Pipeline Fix.

---
 .circleci/config.yml         | 10 ++++++----
 .circleci/maven.settings.xml |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bbe930e2..21b32d56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,4 +1,6 @@
-version: 2
+version: '2.1'
+orbs:
+  circleci-maven-release-orb: sonatype-nexus-community/circleci-maven-release-orb@0.0.18
 jobs:
   build:
     docker:
@@ -12,9 +14,9 @@ jobs:
           keys:
             - v1-dependencies-{{ checksum "pom.xml" }}
             - v1-dependencies-
-      - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes
+      - run: echo $GPG_ASC_BASE64NEW | base64 --decode |  gpg --batch --no-tty --import --yes
       - run: chmod u+x mvnw
-      - run: ./mvnw -s .circleci/maven.settings.xml clean verify
+      - run: ./mvnw -s .circleci/maven.settings.xml clean verify -X
       - run: mvn help:evaluate -Dexpression=project.version -q -DforceStdout > target/version.txt
       - save_cache:
           paths:
@@ -40,7 +42,7 @@ jobs:
           keys:
             - v1-dependencies-{{ checksum "pom.xml" }}
             - v1-dependencies-
-      - run: echo $GPG_ASC_BASE64 | base64 --decode | gpg --batch --no-tty --import --yes
+      - run: echo $GPG_ASC_BASE64NEW | base64 --decode | gpg --version --batch --no-tty --import --yes
       - run: chmod u+x mvnw
       - run: ./mvnw -s .circleci/maven.settings.xml clean deploy -DskipTests
       - save_cache:
diff --git a/.circleci/maven.settings.xml b/.circleci/maven.settings.xml
index fdfd40f5..34e4c866 100644
--- a/.circleci/maven.settings.xml
+++ b/.circleci/maven.settings.xml
@@ -21,7 +21,7 @@
             <id>gpg</id>
             <properties>
                 <gpg.executable>gpg</gpg.executable>
-                <gpg.passphrase>${env.GPG_PASSPHRASE}</gpg.passphrase>
+                <gpg.passphrase>${env.GPG_PASSPHRASENEW}</gpg.passphrase>
             </properties>
         </profile>
     </profiles>