From 08fea04e4d656e9ac185b1782d13785ba139097e Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <rahul.ramesh@thoughtworks.com>
Date: Thu, 31 Aug 2023 16:39:59 +0530
Subject: [PATCH 1/7] [Parvathy, Rahul] | BAH-3193 | Add. Latest Stable
 Packages For Security

Co-authored-by: Parvathy Babu <parvathy.babu@thoughtworks.com>
---
 hip-atomfeed/pom.xml | 9 +++++++--
 pom.xml              | 6 +-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/hip-atomfeed/pom.xml b/hip-atomfeed/pom.xml
index f139930..ebbe708 100644
--- a/hip-atomfeed/pom.xml
+++ b/hip-atomfeed/pom.xml
@@ -32,11 +32,11 @@
         <atomfeed.version>1.10.1</atomfeed.version>
         <hapi-base.version>2.2</hapi-base.version>
         <spring.profiles.active>local,no-liquibase</spring.profiles.active>
-        <quartz.version>2.2.1</quartz.version>
+        <quartz.version>2.4.0-rc1</quartz.version>
         <postgresql.version>42.5.0</postgresql.version>
         <hsqldb.version>2.7.1</hsqldb.version>
         <web-clients.version>0.94.3</web-clients.version>
-        <httpclient.version>4.5</httpclient.version>
+        <httpclient.version>4.5.13</httpclient.version>
         <commons-io.version>2.7</commons-io.version>
         <liquibase.version>4.9.0</liquibase.version>
         <liquibase-slf4j.version>1.0.0</liquibase-slf4j.version>
@@ -210,5 +210,10 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <version>${log4j.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>2.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 8f12ceb..e1a54de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.6</version>
+        <version>2.7.15</version>
     </parent>
 
     <modules>
@@ -35,10 +35,6 @@
                     <from>
                         <image>amazoncorretto:8</image>
                         <platforms>
-                            <platform>
-                                <architecture>amd64</architecture>
-                                <os>linux</os>
-                            </platform>
                             <platform>
                                 <architecture>arm64</architecture>
                                 <os>linux</os>

From 76177cb624c763abbcbf4b061b2b4fe07d2f936f Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Tue, 5 Sep 2023 11:40:12 +0530
Subject: [PATCH 2/7] [Rahul] | BAH-3193 | Add. Java 11 To Workflow

---
 .github/workflows/ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10df25a..9d46c13 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - master
       - 'release-*'
+      - 'BAH-3193'
     tags:
       - '[0-9]+.[0-9]+.[0-9]+'
   workflow_dispatch:
@@ -17,10 +18,11 @@ jobs:
       HELM_CHART_PATH: package/helm/
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: '11'
       - name: Set env.ARTIFACT_VERSION
         run: |
           wget -q https://raw.githubusercontent.com/Bahmni/bahmni-infra-utils/main/setArtifactVersion.sh && chmod +x setArtifactVersion.sh

From b406ffc02bed3fef3ae8fb6ce2575e424bb538a1 Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Tue, 5 Sep 2023 11:51:06 +0530
Subject: [PATCH 3/7] [Rahul] | BAH-3193 | Add. Java 11 As Image pom.xml

Co-authored-by: Parvathy Babu <parvathy.babu@thoughtworks.com>
---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e1a54de..bcf9f39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,8 +33,12 @@
                 <version>3.3.1</version>
                 <configuration>
                     <from>
-                        <image>amazoncorretto:8</image>
+                        <image>amazoncorretto:11</image>
                         <platforms>
+                            <platform>
+                                <architecture>amd64</architecture>
+                                <os>linux</os>
+                            </platform>
                             <platform>
                                 <architecture>arm64</architecture>
                                 <os>linux</os>

From cc4ff7c9d1f6bf740143928f0f96760b0a2bcb0c Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Wed, 6 Sep 2023 15:53:35 +0530
Subject: [PATCH 4/7] [Rahul] | BAH-3193 | Fix. Skip Test

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d46c13..59bc186 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
           DOCKER_REGISTRY_URL: docker.io
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest
+        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTest
       - name: Helm - Update Version and Image Tag
         run: |
           yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml

From 16dd2522282b767c87d8fdc0f68d30352ec75be6 Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Wed, 6 Sep 2023 15:57:18 +0530
Subject: [PATCH 5/7] [Rahul] | BAH-3193 | Fix. Skip Test

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 59bc186..0e2bcdc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
           DOCKER_REGISTRY_URL: docker.io
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTest
+        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTests
       - name: Helm - Update Version and Image Tag
         run: |
           yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml

From 19d99b3ec0c467d59af3714588d209d3f1ade61a Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Wed, 6 Sep 2023 16:00:55 +0530
Subject: [PATCH 6/7] [Rahul] | BAH-3193 | Fix. Skip Test

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e2bcdc..045ca0a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,7 +35,7 @@ jobs:
           DOCKER_REGISTRY_URL: docker.io
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTests
+        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -Dmaven.test.skip=true
       - name: Helm - Update Version and Image Tag
         run: |
           yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml

From b59e42c065b23249fca2d40b0823856a1a44d38a Mon Sep 17 00:00:00 2001
From: Rahul Ramesh <121226043+rahu1ramesh@users.noreply.github.com>
Date: Wed, 6 Sep 2023 16:03:43 +0530
Subject: [PATCH 7/7] [Rahul] | BAH-3193 | Fix. Skip Test

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 045ca0a..370a026 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,13 +29,13 @@ jobs:
           ./setArtifactVersion.sh
           rm setArtifactVersion.sh
       - name: maven build
-        run: mvn clean install
+        run: mvn clean install -DskipTests
       - name: Build hip atomfeed with Maven
         env:
           DOCKER_REGISTRY_URL: docker.io
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -Dmaven.test.skip=true
+        run: mvn compile jib:build -Djib.to.auth.username=${DOCKER_USERNAME} -Djib.to.auth.password=${DOCKER_PASSWORD} -Djib.to.tags=$ARTIFACT_VERSION,latest -DskipTests
       - name: Helm - Update Version and Image Tag
         run: |
           yq --inplace '.image.tag = "${{ env.ARTIFACT_VERSION }}"' $HELM_CHART_PATH/values.yaml