From d43f11440fbf1ca958b8dc62734a2007ea1cf558 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 9 Nov 2023 17:42:51 +0530
Subject: [PATCH 01/84] [HNC-466] updating to onerepo

---
 .github/bootstrap-image/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 97763d3..d2210be 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,7 +1,7 @@
-FROM docker.repo.orl.eng.hitachivantara.com/jenkins-build/maven/open-jdk/11
+FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
-ARG ARTIFACTORY_URL=https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn
+ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar
 

From 53dd7fb2ac7b95af44b981bbcfbc940018329d29 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:58:47 +0530
Subject: [PATCH 02/84] [HNC-466] updating

---
 .github/workflows/bootstrap-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index b64378b..34f35ff 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -4,9 +4,9 @@ on:
   push:
     paths: [ .github/bootstrap-image/** ]
 env:
-  ARTIFACTORY: cicd-oci-release-orl.repo.orl.eng.hitachivantara.com
-  ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
-  ARTIFACTORY_API_KEY: ${{ secrets.ARTIFACTORY_API_KEY }}
+  ARTIFACTORY: one.hitachivantara.com/devops-docker-release
+  ARTIFACTORY_USER: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+  ARTIFACTORY_API_KEY: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
   IMAGE: ${{ github.repository_owner }}/${{ github.event.repository.name }}
 jobs:
 

From 1c745af4d29f1d31b1c1359bff816cd287c47654 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:59:38 +0530
Subject: [PATCH 03/84] update

---
 .github/bootstrap-image/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index d2210be..8c748c6 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -7,6 +7,7 @@ RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VE
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
+# java
 ARG JQ_VERSION=1.6
 RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
     mv jq-linux64 /usr/local/bin/jq && \

From 66e2b6964947df393a0f8502e42730c0962fa6ca Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:09:37 +0530
Subject: [PATCH 04/84] Update bootstrap-image.yml

---
 .github/workflows/bootstrap-image.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 34f35ff..4557d96 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,6 +24,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: login to Artifactory
+        id: login
+        run: docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
+          
       - name: Build
         id: build-image
         run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile .
@@ -31,8 +35,9 @@ jobs:
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          echo "${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
+          # echo "${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
           docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
+          
       - name: Summary
         run: |
           echo ":frog: Image pushed!" >> $GITHUB_STEP_SUMMARY

From 1ee113df08481ac71de8917ed3e8b40eae1793ee Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:11:06 +0530
Subject: [PATCH 05/84] Update

---
 .github/bootstrap-image/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 8c748c6..d2210be 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -7,7 +7,6 @@ RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VE
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
-# java
 ARG JQ_VERSION=1.6
 RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
     mv jq-linux64 /usr/local/bin/jq && \

From afc10846af30191e8297967c62c5668f436f65b1 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:23:52 +0530
Subject: [PATCH 06/84] Update bootstrap-image.yml

---
 .github/workflows/bootstrap-image.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 4557d96..04be218 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -35,6 +35,7 @@ jobs:
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
+          docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
           # echo "${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
           docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
           

From 165e9ace6f5fb6ba393028180d7ed507a490db59 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:24:31 +0530
Subject: [PATCH 07/84] Update

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index d2210be..f2f6ef5 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -6,7 +6,7 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
-
+# Java
 ARG JQ_VERSION=1.6
 RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
     mv jq-linux64 /usr/local/bin/jq && \

From 8b4d86153ff589ca0c4d3febc818d4713a4bdfe5 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:38:14 +0530
Subject: [PATCH 08/84] Update bootstrap-image.yml

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

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 04be218..422b603 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
+          docker login ${{ env.ARTIFACTORY }} -u  ${{ secrets.JARJAR_CICD_ONE_USER }} -p ${{ secrets.JARJAR_CICD_ONE_KEY }}
           # echo "${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
           docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
           

From cc062cd26f00a9ee582e875699e8bcdaeacd1998 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 16 Nov 2023 19:38:47 +0530
Subject: [PATCH 09/84] Update

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index f2f6ef5..d2210be 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -6,7 +6,7 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
-# Java
+
 ARG JQ_VERSION=1.6
 RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
     mv jq-linux64 /usr/local/bin/jq && \

From 7a1d0b4eebbe550d01739f75e205bbf96c927384 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:42:19 +0530
Subject: [PATCH 10/84] Update bootstrap-image.yml

---
 .github/workflows/bootstrap-image.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 422b603..a4faba5 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -35,8 +35,7 @@ jobs:
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          docker login ${{ env.ARTIFACTORY }} -u  ${{ secrets.JARJAR_CICD_ONE_USER }} -p ${{ secrets.JARJAR_CICD_ONE_KEY }}
-          # echo "${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
+          # docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
           docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
           
       - name: Summary

From fa28a4c8ed906b96b416eb18535aa82e1e5966ea Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:43:04 +0530
Subject: [PATCH 11/84] Build New Image with Pentaho USER

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index d2210be..0b5db3d 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -12,7 +12,7 @@ RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${
     mv jq-linux64 /usr/local/bin/jq && \
     chmod +x /usr/local/bin/jq
 
-# pip
+# pip 
 RUN apt-get update && \
     apt-get install -y python3-pip python3.11-venv && \
     apt-get clean && \

From cff83c0c0093ab6c2e2cc78d16dc34917292cfb7 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:45:02 +0530
Subject: [PATCH 12/84] Update bootstrap-image.yml

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

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a4faba5..72811e6 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -35,13 +35,13 @@ jobs:
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          # docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
           docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
           
       - name: Summary
         run: |
           echo ":frog: Image pushed!" >> $GITHUB_STEP_SUMMARY
           echo "Pull it from '${{ env.ARTIFACTORY }}/${{ env.IMAGE }}'" >> $GITHUB_STEP_SUMMARY
+          
       - uses: rickstaa/action-create-tag@v1
         with:
           tag: "build-image-${{ env.IMAGE_TAG }}"

From a0bf81d1da21e67683e6ec2e2d7539957d6bd744 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:45:31 +0530
Subject: [PATCH 13/84] Build New Image with Pentaho USER

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 0b5db3d..204d9a0 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -12,7 +12,7 @@ RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${
     mv jq-linux64 /usr/local/bin/jq && \
     chmod +x /usr/local/bin/jq
 
-# pip 
+# pip  
 RUN apt-get update && \
     apt-get install -y python3-pip python3.11-venv && \
     apt-get clean && \

From 6963c8198c0923627b231683f0eef7c02f3d9b0a Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:51:37 +0530
Subject: [PATCH 14/84] Update pr.yml

---
 .github/workflows/pr.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 99e9ac7..10e260e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -57,7 +57,10 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230712.10
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
       volumes:
         - /home/runner/caches/pentaho/.m2:/root/.m2
 
@@ -120,4 +123,4 @@ jobs:
         env:
           Slack_Token: ${{ secrets.SLACK_TOKEN }}
           Slack_Channel: ${{ env.SLACK_CHANNEL }}
-          report: true
\ No newline at end of file
+          report: true

From eacc97abd0c650e3e3f676f44f9d2eb70637124d Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 17 Nov 2023 16:52:58 +0530
Subject: [PATCH 15/84] Update merge.yml

---
 .github/workflows/merge.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 845ee95..53f7d24 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -113,7 +113,10 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230712.10
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
       volumes:
         - /home/runner/caches/pentaho/.m2:/root/.m2
     steps:

From 715ed10c7e47f25e32ed527430b1e508e0506b32 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Mon, 20 Nov 2023 16:46:04 +0530
Subject: [PATCH 16/84] Update merge.yml

---
 .github/workflows/merge.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 53f7d24..c239e26 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -91,7 +91,10 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230712.10
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
       volumes:
         - /home/runner/caches/pentaho/.m2:/root/.m2
 
@@ -151,7 +154,10 @@ jobs:
       JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230712.10
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
       volumes:
         - /home/runner/caches/pentaho/.m2:/root/.m2
     steps:

From 4c027055b0e4bc4eb17089745ee88b178617c00a Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Mon, 20 Nov 2023 16:47:35 +0530
Subject: [PATCH 17/84] Update pr.yml

---
 .github/workflows/pr.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 10e260e..910018f 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -82,7 +82,10 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230712.10
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
       volumes:
         - /home/runner/caches/pentaho/.m2:/root/.m2
 

From 6af138dae6f49a26194ffd06366ac0c33400edfd Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:48:56 +0530
Subject: [PATCH 18/84] [HNC-466] Updating to one hitachi

---
 .github/workflows/pr.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 910018f..3396f6e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -9,7 +9,7 @@ on:
       arti_host:
         required: false
         type: string
-        default: https://repo.orl.eng.hitachivantara.com
+        default: https://one.hitachivantara.com
         description: "Artifactory's Host name"
       sonar_project_key:
         required: true
@@ -30,22 +30,22 @@ env:
   ARTIFACTORY_HOST: ${{ inputs.arti_host }}
   ARTIFACTORY_BASE_URL: ${ARTIFACTORY_HOST}/artifactory
 
-  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/pnt-mvn
+  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/maven
 
   NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
   NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
 
-  PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-mvn-dev-orl
-  PRIVATE_RELEASE_REPO: pntprv-mvn-dev-orl
+  PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-dev
+  PRIVATE_RELEASE_REPO: pntprv-maven-dev
   PRIVATE_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_RELEASE_REPO}
 
-  PUBLIC_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-mvn-snapshot-orl
-  PRIVATE_SNAPSHOT_REPO: pntprv-mvn-snapshot-orl
+  PUBLIC_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-snapshot
+  PRIVATE_SNAPSHOT_REPO: pntprv-maven-snapshot
   PRIVATE_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_SNAPSHOT_REPO}
 
-  DOCKER_PULL_HOST: pnt-docker.repo.orl.eng.hitachivantara.com/
-  DOCKER_PUBLIC_PUSH_HOST: pntpub-docker-dev-orl.repo.orl.eng.hitachivantara.com
-  DOCKER_PRIVATE_PUSH_HOST: pntprv-docker-dev-orl.repo.orl.eng.hitachivantara.com
+  DOCKER_PULL_HOST: one.hitachivantara.com/artifactory/docker/
+  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/artifactory/pntpub-docker-dev/
+  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/artifactory/pntprv-docker-dev/
 
   SLACK_CHANNEL: "${{ inputs.slack_channels }}"
 

From 09678979ab334bd70641d34bb9e345879b335a5b Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:54:35 +0530
Subject: [PATCH 19/84] [HNC-466] Updating to one hitachi

---
 .github/workflows/merge.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index c239e26..61a531b 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -21,7 +21,7 @@ on:
       arti_host:
         required: false
         type: string
-        default: https://repo.orl.eng.hitachivantara.com
+        default: https://one.hitachivantara.com/
         description: "Artifactory's Host name"
       sonar_project_key:
         required: true
@@ -66,22 +66,22 @@ env:
   ARTIFACTORY_HOST: ${{ inputs.arti_host }}
   ARTIFACTORY_BASE_URL: ${ARTIFACTORY_HOST}/artifactory
 
-  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/pnt-mvn
+  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/maven
 
   NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
   NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
 
-  PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-mvn-dev-orl
-  PRIVATE_RELEASE_REPO: pntprv-mvn-dev-orl
+  PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-dev
+  PRIVATE_RELEASE_REPO: pntprv-maven-dev
   PRIVATE_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_RELEASE_REPO}
 
-  PUBLIC_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-mvn-snapshot-orl
-  PRIVATE_SNAPSHOT_REPO: pntprv-mvn-snapshot-orl
+  PUBLIC_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-snapshot
+  PRIVATE_SNAPSHOT_REPO: pntprv-maven-snapshot
   PRIVATE_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_SNAPSHOT_REPO}
 
-  DOCKER_PULL_HOST: pnt-docker.repo.orl.eng.hitachivantara.com/
-  DOCKER_PUBLIC_PUSH_HOST: pntpub-docker-dev-orl.repo.orl.eng.hitachivantara.com
-  DOCKER_PRIVATE_PUSH_HOST: pntprv-docker-dev-orl.repo.orl.eng.hitachivantara.com
+  DOCKER_PULL_HOST: one.hitachivantara.com/artifactory/docker/
+  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/artifactory/pntpub-docker-dev/
+  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/artifactory/pntprv-docker-dev/
 
 jobs:
 

From 33f3b3cce5cea7fd6c8cab11061fbdc84b981995 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:58:23 +0530
Subject: [PATCH 20/84] [HNC-466] Updating to one hitchi

---
 .github/workflows/release.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3268580..8893577 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
       arti_host:
         required: false
         type: string
-        default: https://repo.orl.eng.hitachivantara.com
+        default: https://one.hitachivantara.com/
         description: "Artifactory's Host name"
       box_upload:
         type: boolean
@@ -33,7 +33,7 @@ env:
   ARTIFACTORY_HOST: ${{ inputs.arti_host }}
   ARTIFACTORY_BASE_URL: ${ARTIFACTORY_HOST}/artifactory
 
-  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/pnt-mvn
+  RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/maven
 
   NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
   NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
@@ -48,7 +48,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: docker.repo.orl.eng.hitachivantara.com/pentaho/actions-common:20230823.18
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20230823.18
 
     steps:
 

From 3250cb32083f281452b7b29b2942381b95f4523b Mon Sep 17 00:00:00 2001
From: Venkat Ganpisetty <venkat.ganpisetty@hitachivantara.com>
Date: Mon, 11 Dec 2023 16:11:04 +0530
Subject: [PATCH 21/84] [HNC-466]updating to onehitachi artifactory

---
 .github/workflows/bootstrap-image.yml | 2 +-
 .github/workflows/merge.yml           | 6 +++---
 .github/workflows/pr.yml              | 6 +++---
 .github/workflows/release.yml         | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 72811e6..3532c4b 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -26,7 +26,7 @@ jobs:
 
       - name: login to Artifactory
         id: login
-        run: docker login ${{ env.ARTIFACTORY }} -u ${{ env.ARTIFACTORY_USER }} -p ${{ env.ARTIFACTORY_API_KEY }}
+        run: docker login ${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
           
       - name: Build
         id: build-image
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 61a531b..e7e81fb 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -79,9 +79,9 @@ env:
   PRIVATE_SNAPSHOT_REPO: pntprv-maven-snapshot
   PRIVATE_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_SNAPSHOT_REPO}
 
-  DOCKER_PULL_HOST: one.hitachivantara.com/artifactory/docker/
-  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/artifactory/pntpub-docker-dev/
-  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/artifactory/pntprv-docker-dev/
+  DOCKER_PULL_HOST: one.hitachivantara.com/docker/
+  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/pntpub-docker-dev/
+  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/pntprv-docker-dev/
 
 jobs:
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 3396f6e..f19dc06 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -43,9 +43,9 @@ env:
   PRIVATE_SNAPSHOT_REPO: pntprv-maven-snapshot
   PRIVATE_SNAPSHOT_REPO_URL: ${ARTIFACTORY_BASE_URL}/${PRIVATE_SNAPSHOT_REPO}
 
-  DOCKER_PULL_HOST: one.hitachivantara.com/artifactory/docker/
-  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/artifactory/pntpub-docker-dev/
-  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/artifactory/pntprv-docker-dev/
+  DOCKER_PULL_HOST: one.hitachivantara.com/docker/
+  DOCKER_PUBLIC_PUSH_HOST: one.hitachivantara.com/pntpub-docker-dev/
+  DOCKER_PRIVATE_PUSH_HOST: one.hitachivantara.com/pntprv-docker-dev/
 
   SLACK_CHANNEL: "${{ inputs.slack_channels }}"
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8893577..6e7fd21 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
       arti_host:
         required: false
         type: string
-        default: https://one.hitachivantara.com/
+        default: https://one.hitachivantara.com
         description: "Artifactory's Host name"
       box_upload:
         type: boolean

From edbf85a8e22f4d9c5551aba0dfcdd99cffba477d Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Mon, 11 Dec 2023 17:28:48 +0530
Subject: [PATCH 22/84] Update release.yml

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6e7fd21..56759ba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20230823.18
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
 
     steps:
 

From b90d7dafe8bbaf65fb13fc6706eab3c410a06053 Mon Sep 17 00:00:00 2001
From: Venkat Ganpisetty <venkat.ganpisetty@hitachivantara.com>
Date: Thu, 21 Dec 2023 20:40:34 +0530
Subject: [PATCH 23/84] [HNC-466] Updated tests

---
 .github/workflows/merge.yml | 53 ++++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index e7e81fb..b341856 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -5,7 +5,15 @@ on:
       modules_to_build:
         type: string
         required: false
-        description: "The modules to build when running from the root of the project. Defaults to everything ('.')"
+        description: >
+          The modules to build when running from the root of the project. Defaults to everything ('.').
+          Using this option builds only the modules you specify, regardless of whether those modules have changes.
+      modules_to_always_build_in_addition_to_those_with_changes:
+        type: string
+        required: false
+        description: >
+          When using the default behavior of building only changed modules (i.e., 'modules_to_build' is NOT specified),
+          use this option to list any modules you want to build in addition to those that have changes.
       version:
         type: string
         required: true
@@ -52,6 +60,10 @@ on:
         type: string
         description: "Extra additional directives for the Maven command"
         default: ""
+      test_scenario_json:
+        required: false
+        type: string
+        description: "For PDI plugin integration tests, path to the json file containing test scenarios for each plugin"  
 
 env:
   VERSION: "${{ inputs.version }}"
@@ -135,12 +147,14 @@ jobs:
       - name: Determine which changes occurred
         if: ${{ inputs.modules_to_build == '' }}
         id: change_detection
-        uses: hv-actions/change-detection-builder@1.0.1
+        uses: hv-actions/change-detection-builder@stable
 
       - name: Build code and deploy artifacts
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         with:
-          command: mvn clean deploy -DskipTests -pl "${{ inputs.modules_to_build || steps.change_detection.outputs.changed_modules }}" -amd
+          command: |
+            mvn clean deploy -DskipTests -amd \
+            -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}"
         env:
           cmd_type: BUILD
 
@@ -172,7 +186,7 @@ jobs:
       - name: Determine which changes occurred
         if: ${{ inputs.modules_to_build == '' }}
         id: change_detection
-        uses: hv-actions/change-detection-builder@1.0.1
+        uses: hv-actions/change-detection-builder@stable
 
       - name: Determine version
         id: version
@@ -194,23 +208,38 @@ jobs:
             project.stage=master
 
       - name: Build code and deploy artifacts
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         with:
           command: |
             mvn clean deploy -DskipTests \
               -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
-              -pl "${{ inputs.modules_to_build || steps.change_detection.outputs.changed_modules }}" -amd ${{ inputs.additional_mvn_directives }}
+              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+              -amd ${{ inputs.additional_mvn_directives }}
         env:
           cmd_type: BUILD
 
       - name: Run unit-tests
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         with:
           command: |
             mvn verify -B -Daudit \
-              -pl "${{ inputs.modules_to_build || steps.change_detection.outputs.changed_modules }}" -amd
+              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+              -amd
         env:
           cmd_type: UNIT_TEST
+          reporter: 'java-junit'
+          fail-on-error: 'true'
+          test_report_path: '**/target/surefire-reports/*.xml'
+
+      - name: Run PDI plugin integration tests
+        uses: pentaho/actions-common@stable
+        if: ${{ inputs.test_scenario_json }}
+        with:
+          changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
+          test_scenario_json: "${{ inputs.test_scenario_json }}"
+        env:
+          run_plugin_integration_tests: true
+          BASE_VERSION: "${{ inputs.base_version }}"
 
       #- name: Blackduck Scan
       #  uses: lumada-common-services/gh-composite-actions@1.2.0
@@ -223,13 +252,13 @@ jobs:
 
       - name: Sonarqube scan
         continue-on-error: true
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         env:
           sonar_utility: sonar-scanner
           sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
 
       - name: Tag release
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         env:
           Tag_version: "${{ steps.version.outputs.current-version }}"
           push_tag_only: true
@@ -257,7 +286,7 @@ jobs:
 
       - name: Report notifications
         if: always()
-        uses: lumada-common-services/gh-composite-actions@1.3.1
+        uses: lumada-common-services/gh-composite-actions@stable
         env:
           Slack_Token: ${{ secrets.SLACK_TOKEN }}
           Slack_Channel: ${{ env.SLACK_CHANNEL }}

From 2095832ab1aee5e6cb4c90ff0583e67b9e5a2110 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:41:14 +0530
Subject: [PATCH 24/84] [HNC-466] rebuilding version merger


From 2b8a79f1d65594383e1702c07102e6c21c9cbed9 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:44:24 +0530
Subject: [PATCH 25/84] [HNC-466] updating version

---
 .github/bootstrap-image/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 204d9a0..7b92507 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -13,7 +13,10 @@ RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${
     chmod +x /usr/local/bin/jq
 
 # pip  
+# test
 RUN apt-get update && \
     apt-get install -y python3-pip python3.11-venv && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
+    
+    

From 07623daece99ba2b194e3802f6c7f6cfef490639 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:49:30 +0530
Subject: [PATCH 26/84] [HNC-466] removing login

---
 .github/workflows/bootstrap-image.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 3532c4b..c0f492f 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,9 +24,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: login to Artifactory
-        id: login
-        run: docker login ${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
+      # - name: login to Artifactory
+      #   id: login
+      #   run: docker login ${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin
           
       - name: Build
         id: build-image

From 4263a87cbf0cc8ea4bb4415b08f9a4820249d5d1 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:50:05 +0530
Subject: [PATCH 27/84] [HNC-466] update version

---
 .github/bootstrap-image/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 7b92507..2220436 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -12,8 +12,7 @@ RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${
     mv jq-linux64 /usr/local/bin/jq && \
     chmod +x /usr/local/bin/jq
 
-# pip  
-# test
+# pip
 RUN apt-get update && \
     apt-get install -y python3-pip python3.11-venv && \
     apt-get clean && \

From e54f5fa8b045aa3d2610498c2fe67480685258b9 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Thu, 21 Dec 2023 21:56:44 +0530
Subject: [PATCH 28/84] [HNC-466]Updating image version

---
 .github/workflows/merge.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index b341856..aca40b4 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -103,7 +103,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -128,7 +128,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -168,7 +168,7 @@ jobs:
       JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231117.30
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}

From 9e0d37179333298ef3810a72ead2913d97f0bb48 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Fri, 22 Dec 2023 13:13:27 +0530
Subject: [PATCH 29/84] [HNC-466] passing token

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

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index c0f492f..24ac069 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile .
+        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --build-arg PENTAHO_CICD_ONE_KEY="${{ secrets.PENTAHO_CICD_ONE_KEY }}" .
 
       - name: Push to Artifactory
         id: push-to-artifactory

From ebb472626f6d10cfb03522b966634a348b3fdbd3 Mon Sep 17 00:00:00 2001
From: Aditya <112469025+AdityaHitachi@users.noreply.github.com>
Date: Fri, 22 Dec 2023 13:53:23 +0530
Subject: [PATCH 30/84] Building With auth

---
 .github/bootstrap-image/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 2220436..2a17dce 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -2,8 +2,9 @@ FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
+ARG PENTAHO_CICD_ONE_KEY
 
-RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar
+RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY"
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From e94191cd907d42607763d0fca8720bfbeadf0112 Mon Sep 17 00:00:00 2001
From: vganpisetty <97574298+vganpisetty@users.noreply.github.com>
Date: Fri, 22 Dec 2023 13:59:02 +0530
Subject: [PATCH 31/84] [HNC-466]Updating image version

---
 .github/workflows/merge.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index aca40b4..952dc2b 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -103,7 +103,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -128,7 +128,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -168,7 +168,7 @@ jobs:
       JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231221.60
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}

From 16d002d00b3ad4f97c3e149d8f4e7124ea65a024 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 15:58:33 +0530
Subject: [PATCH 32/84] [HNC-466]-Building Docker Image

---
 .github/bootstrap-image/Dockerfile    | 6 +++++-
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 2a17dce..3a3e3bd 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,8 +1,12 @@
+#syntax=docker/dockerfile:1
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
-ARG PENTAHO_CICD_ONE_KEY
+
+RUN --mount=type=secret,id=mytoken \
+    PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
 RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY"
 
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 24ac069..898c6fd 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --build-arg PENTAHO_CICD_ONE_KEY="${{ secrets.PENTAHO_CICD_ONE_KEY }}" .
+        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 5cb5de71bd7debe599793aadd2a3a773c9be8c06 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:00:25 +0530
Subject: [PATCH 33/84] [HNC-466]-Building Docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 3a3e3bd..5d3d315 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,6 @@
 #syntax=docker/dockerfile:1
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 898c6fd..4b735b1 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
+        run: docker buildx -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 2cf57b25c9c6bc05dace1aa08f1b98ce5c35559f Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:02:42 +0530
Subject: [PATCH 34/84] [HNC-466]-Build Docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5d3d315..33d72ed 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,6 +1,7 @@
 #syntax=docker/dockerfile:1
 
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 4b735b1..405b6cb 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
+        run: docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 3cd92a64926dd17c489b643bf1f0cf69bf0aaa05 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:04:47 +0530
Subject: [PATCH 35/84] [HNC-466]-Building docker image

---
 .github/bootstrap-image/Dockerfile    | 4 ----
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 33d72ed..5de5c00 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,7 +1,3 @@
-#syntax=docker/dockerfile:1
-
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 405b6cb..365d8b2 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env="${{ secrets.PENTAHO_CICD_ONE_KEY }}" 
+        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From be1d9f7219adf2146b5f51a3e82354029cf26970 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:14:21 +0530
Subject: [PATCH 36/84] [HNC-466]-Building docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5de5c00..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 365d8b2..bbd5370 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From db77208f10d150b46899c7747975a168f34835b6 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:26:11 +0530
Subject: [PATCH 37/84] [HNC-466]-Build Docker image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..439f757 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index bbd5370..a92d515 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 574ecf92d0608a0ccadb7a3c8906e65153e91207 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:28:44 +0530
Subject: [PATCH 38/84] [HNC-466]-Build Docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 439f757..b83ba8f 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,6 @@
 
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a92d515..f843bde 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx --tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 4bb752f261be6c1f84cc42e953034476cfe74ba1 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:31:07 +0530
Subject: [PATCH 39/84] [HNC-466]-Build Docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index b83ba8f..94cbc88 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,6 +1,7 @@
 
 
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index f843bde..3acc107 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx --tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From b40a2179c40a9677c0f43f750b5a40a86ba79a24 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:32:39 +0530
Subject: [PATCH 40/84] [HNC-466]-Build Image

---
 .github/bootstrap-image/Dockerfile    | 3 ---
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 94cbc88..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,7 +1,4 @@
 
-
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 3acc107..bef37b0 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx build --tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From a3840e34dcbb740d005a0e4a8cc242a3649adaa1 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:35:21 +0530
Subject: [PATCH 41/84] [HNC-466]-Build Docker Image with build

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..439f757 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index bef37b0..365d8b2 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx build --tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --file .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 4491639a8dbeb6f36be5fad1f6c95ecc5f678223 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:39:26 +0530
Subject: [PATCH 42/84] [HNC-466]-Build Docker Image with BuildKit

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 439f757..b83ba8f 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,6 @@
 
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 365d8b2..bbd5370 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From a00eddf5516388b69eb0cd8199729673f5971f08 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:42:47 +0530
Subject: [PATCH 43/84] [HNC-466]-Build with Buildx

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

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index bbd5370..a92d515 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 6ef3ded3b00bff6f2169e4d9a9e054e9497ad76f Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:43:26 +0530
Subject: [PATCH 44/84] [HNC-466]-Buildx

---
 .github/bootstrap-image/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index b83ba8f..94cbc88 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,6 +1,7 @@
 
 
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8

From 19b28d60aef2958bf48669ee11783c77a9747563 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:44:54 +0530
Subject: [PATCH 45/84] [HNC-466]-Buildx

---
 .github/bootstrap-image/Dockerfile    | 3 ---
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 94cbc88..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,7 +1,4 @@
 
-
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a92d515..8700471 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx build tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 63804c5799ff2e6abb6da3ca32e4c0483938122b Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:47:45 +0530
Subject: [PATCH 46/84] [HNC-466]-Build Docker Image

---
 .github/bootstrap-image/Dockerfile    | 1 -
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..5de5c00 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,3 @@
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 8700471..2b3c0af 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx build tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: DOCKER_BUILDKIT=1 docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 6b65fa0f0e5842e0bbcb2f0aea9dd7dd3b61f50c Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:53:43 +0530
Subject: [PATCH 47/84] [HNC-466]-Build Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5de5c00..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 2b3c0af..ad956d2 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -30,7 +30,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: DOCKER_BUILDKIT=1 docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From f25fb9af2c39b39db98036cf08d70f7523661bb8 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 16:59:52 +0530
Subject: [PATCH 48/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..439f757 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index ad956d2..bc697f9 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,6 +24,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       # - name: login to Artifactory
       #   id: login
       #   run: docker login ${{ env.ARTIFACTORY_API_KEY }}" | docker login ${{ env.ARTIFACTORY }} --username ${{ env.ARTIFACTORY_USER }} --password-stdin

From 102dfe3e2034969fd5c7e3aa2f327b3c72a045a3 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:02:34 +0530
Subject: [PATCH 49/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    | 2 --
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 439f757..5de5c00 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,3 @@
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index bc697f9..8beed06 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx tag "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" file .github/bootstrap-image/Dockerfile secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 44c274629b59e438b89d0c73222fa4531eb4c4b8 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:10:50 +0530
Subject: [PATCH 50/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5de5c00..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 8beed06..e27ad45 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f ".github/bootstrap-image/Dockerfile" --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 1d5cdb46181537ba6a604cf5c8299e91acea5d23 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:13:16 +0530
Subject: [PATCH 51/84] [HNC-466]-Testing

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

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index e27ad45..a5a90b7 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f ".github/bootstrap-image/Dockerfile" --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker  build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 2416a939c9d8bc7d29e362866a569f1ca11e97eb Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:14:19 +0530
Subject: [PATCH 52/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..439f757 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8

From f1c1f52fa159445204b2d6a25233af58c63a3d66 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:17:06 +0530
Subject: [PATCH 53/84] [HNC-466]-testing

---
 .github/bootstrap-image/Dockerfile    | 2 --
 .github/workflows/bootstrap-image.yml | 7 +++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 439f757..5de5c00 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,3 @@
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a5a90b7..1373ce3 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
       # - name: login to Artifactory
       #   id: login
@@ -33,8 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker  build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
-
+        run: docker build  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile 
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |

From cba39689ef23f9e69f1bf3a1eb5fde16876c1527 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:18:18 +0530
Subject: [PATCH 54/84] [HNC-466]_testing

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5de5c00..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 1373ce3..2f2db5f 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       # - name: login to Artifactory
       #   id: login
@@ -33,7 +33,8 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile 
+        run: docker build  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile
+         
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |

From 105a0b6d6a063ed2fff0d14e22a4a2c5a0945d4a Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:21:28 +0530
Subject: [PATCH 55/84] [HNC-466]_testing

---
 .github/bootstrap-image/Dockerfile    | 1 -
 .github/workflows/bootstrap-image.yml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..5de5c00 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,3 @@
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 2f2db5f..c3e1b36 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,8 +33,8 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile
-         
+        run: docker buildx build -t ${{ env.ARTIFACTORY }}/${{ env.IMAGE }} -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |

From 53ca511bcc9c0c58986ad0eaeb2bc854eff2b9c8 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:29:16 +0530
Subject: [PATCH 56/84] [HNC-466]-Build Image

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 5de5c00..9fefb33 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,3 +1,4 @@
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index c3e1b36..ddce39c 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t ${{ env.ARTIFACTORY }}/${{ env.IMAGE }} -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}
+        run: docker buildx build -t ${{ env.ARTIFACTORY }}/${{ env.IMAGE }} -f .github/bootstrap-image/Dockerfile  --secret id=mytoken[,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}]
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 706476b3c5356ea6555b321503a1464c91d64af3 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:34:05 +0530
Subject: [PATCH 57/84] [HNC-466]-testing

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9fefb33..439f757 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,4 +1,5 @@
 
+
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index ddce39c..b6761da 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t ${{ env.ARTIFACTORY }}/${{ env.IMAGE }} -f .github/bootstrap-image/Dockerfile  --secret id=mytoken[,env=${{ secrets.PENTAHO_CICD_ONE_KEY }}]
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
 
       - name: Push to Artifactory
         id: push-to-artifactory

From 55f39951992cd32de6e1e93ec260ce8095ed5328 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:44:24 +0530
Subject: [PATCH 58/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    |  2 +-
 .github/workflows/bootstrap-image.yml | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 439f757..b33cf84 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -8,7 +8,7 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -L -o version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY"
+RUN curl -L  ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY" && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index b6761da..a52f0c7 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -35,11 +35,17 @@ jobs:
         id: build-image
         run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
 
+      # - name: Push to Artifactory
+      #   id: push-to-artifactory
+      #   run: |
+      #     docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
+
+      
       - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          docker push "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}"
-          
+          docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
+              
       - name: Summary
         run: |
           echo ":frog: Image pushed!" >> $GITHUB_STEP_SUMMARY

From c8e33f9928ca8043711d18280ec4d91069abe7ce Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:48:52 +0530
Subject: [PATCH 59/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    |  2 +-
 .github/workflows/bootstrap-image.yml | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index b33cf84..38fff31 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -8,7 +8,7 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -L  ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY" && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+RUN curl -L  ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY" 
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a52f0c7..364e281 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -24,8 +24,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+      # - name: Set up Docker Buildx
+      #   uses: docker/setup-buildx-action@v3
 
       # - name: login to Artifactory
       #   id: login
@@ -33,7 +33,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
+        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
 
       # - name: Push to Artifactory
       #   id: push-to-artifactory
@@ -41,10 +41,10 @@ jobs:
       #     docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
 
       
-      - name: Push to Artifactory
-        id: push-to-artifactory
-        run: |
-          docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
+      # - name: Push to Artifactory
+      #   id: push-to-artifactory
+      #   run: |
+      #     docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
               
       - name: Summary
         run: |

From 52789d739a2798fe6d9ff0f7dd94454009378d3f Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:53:09 +0530
Subject: [PATCH 60/84] [HNC-466]-Testing

---
 .github/workflows/bootstrap-image.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 364e281..a89ef1b 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -21,11 +21,12 @@ jobs:
           IMAGE_TAG=$(date +'%Y%m%d').${{ github.run_number }}
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
           echo "IMAGE=${{ env.IMAGE }}:$IMAGE_TAG" >> $GITHUB_ENV
+          
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       # - name: login to Artifactory
       #   id: login
@@ -33,7 +34,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
 
       # - name: Push to Artifactory
       #   id: push-to-artifactory

From bb383c37544a01edafe30b7712467719bc1faf73 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 17:53:37 +0530
Subject: [PATCH 61/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 38fff31..9609668 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -1,5 +1,3 @@
-
-
 FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 
 ARG VERSION_MERGER=1.0.8

From e9c9d9474e193a66f009037a3a678e7542780c73 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:02:31 +0530
Subject: [PATCH 62/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile    | 5 ++++-
 .github/workflows/bootstrap-image.yml | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9609668..52ec516 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -3,10 +3,13 @@ FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
+RUN --mount=type=secret,id=myuser \
+    PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
+
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -L  ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "Authorization: Bearer $PENTAHO_CICD_ONE_KEY" 
+RUN curl -L -u $PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index a89ef1b..c7fd9d8 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -21,7 +21,7 @@ jobs:
           IMAGE_TAG=$(date +'%Y%m%d').${{ github.run_number }}
           echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
           echo "IMAGE=${{ env.IMAGE }}:$IMAGE_TAG" >> $GITHUB_ENV
-          
+
       - name: Checkout code
         uses: actions/checkout@v3
 
@@ -34,7 +34,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile  --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=${{ secrets.PENTAHO_CICD_ONE_USER }} --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
 
       # - name: Push to Artifactory
       #   id: push-to-artifactory

From 63db81996a5d157a1ae9c00c1be1b343356ecb46 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:07:10 +0530
Subject: [PATCH 63/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 52ec516..e4653eb 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,7 +9,7 @@ RUN --mount=type=secret,id=myuser \
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -L -u $PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
+RUN curl -u $PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From f31282439b89703b7543036b28977fc214a19183 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:36:07 +0530
Subject: [PATCH 64/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index e4653eb..a47bf0f 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,7 +9,9 @@ RUN --mount=type=secret,id=myuser \
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -u $PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
+RUN curl -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
+
+#RUN curl -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From 1e5778a52abb7d19dba7bac324b1c6321b71ef1e Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:41:17 +0530
Subject: [PATCH 65/84] [HNC-466]-testing

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index a47bf0f..ca4ee91 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,7 +9,7 @@ RUN --mount=type=secret,id=myuser \
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
+RUN curl -X GET "${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar" -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
 
 #RUN curl -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 

From ebedaca40d93a5c1efd8217d24cd88b75edf2f97 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:46:08 +0530
Subject: [PATCH 66/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index ca4ee91..2e5adbd 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,7 +9,10 @@ RUN --mount=type=secret,id=myuser \
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN curl -X GET "${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar" -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
+
+#RUN curl -L "${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar" -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
+
+RUN curl -L version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
 
 #RUN curl -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 

From a71b9dead5c01cd376e03d09c56e496946dc491a Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Fri, 22 Dec 2023 19:49:09 +0530
Subject: [PATCH 67/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 2e5adbd..9f7e6f2 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -12,7 +12,7 @@ RUN --mount=type=secret,id=mytoken \
 
 #RUN curl -L "${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar" -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
 
-RUN curl -L version-merger.jar ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
+RUN curl -L ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
 
 #RUN curl -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
 

From c427ecd3e4fe54b77887cfd1f13ccffdc6d5933f Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 13:21:08 +0530
Subject: [PATCH 68/84] [HNC-466]-Building Docker Image

---
 .github/bootstrap-image/Dockerfile | 7 +------
 version-merger.jar                 | 6 ++++++
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 version-merger.jar

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 9f7e6f2..eb73f82 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,12 +9,7 @@ RUN --mount=type=secret,id=myuser \
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-
-#RUN curl -L "${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar" -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
-
-RUN curl -L ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar -H "X-JFrog-Art-Api: $PENTAHO_CICD_ONE_KEY"
-
-#RUN curl -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar 
+RUN curl -L -u${PENTAHO_CICD_ONE_USER}:${PENTAHO_CICD_ONE_KEY} -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 
diff --git a/version-merger.jar b/version-merger.jar
new file mode 100644
index 0000000..a016210
--- /dev/null
+++ b/version-merger.jar
@@ -0,0 +1,6 @@
+{
+  "errors" : [ {
+    "status" : 401,
+    "message" : "Bad credentials"
+  } ]
+}
\ No newline at end of file

From b9d80e8462f60829b954b1bc7f889ef005a142a8 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 13:31:08 +0530
Subject: [PATCH 69/84] [HNC-466]-Testing

---
 .github/bootstrap-image/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index eb73f82..8aa289d 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -4,11 +4,13 @@ ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 RUN --mount=type=secret,id=myuser \
-    PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
+    export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
 
 RUN --mount=type=secret,id=mytoken \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
+RUN echo $PENTAHO_CICD_ONE_USER
+
 RUN curl -L -u${PENTAHO_CICD_ONE_USER}:${PENTAHO_CICD_ONE_KEY} -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh

From 4bf330d99eae874e7525aa9310fa443d838c67e5 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 13:33:05 +0530
Subject: [PATCH 70/84] [HNC-466]-Testing Docker Image Build

---
 .github/bootstrap-image/Dockerfile    | 1 +
 .github/workflows/bootstrap-image.yml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 8aa289d..0f5808e 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -3,6 +3,7 @@ FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
+
 RUN --mount=type=secret,id=myuser \
     export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
 
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index c7fd9d8..52bc5c4 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -34,7 +34,7 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=${{ secrets.PENTAHO_CICD_ONE_USER }} --secret id=mytoken,env=${{ secrets.PENTAHO_CICD_ONE_KEY }} .
+        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=ARTIFACTORY_USER --secret id=mytoken,env=ARTIFACTORY_API_KEY .
 
       # - name: Push to Artifactory
       #   id: push-to-artifactory

From 28fea6fcf20b3d084690518caca87e5690f4da9c Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 13:36:05 +0530
Subject: [PATCH 71/84] [HNC-466]-Building Docker Image

---
 .github/bootstrap-image/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 0f5808e..baa57f5 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -8,11 +8,11 @@ RUN --mount=type=secret,id=myuser \
     export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
 
 RUN --mount=type=secret,id=mytoken \
-    PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
+    export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN echo $PENTAHO_CICD_ONE_USER
+RUN echo "$PENTAHO_CICD_ONE_USER"
 
-RUN curl -L -u${PENTAHO_CICD_ONE_USER}:${PENTAHO_CICD_ONE_KEY} -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From 4ce8099acfad2f02ae61427e0bbd0c50e45243b3 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 14:21:06 +0530
Subject: [PATCH 72/84] [HNC-466]-Build Docker Image

---
 .github/bootstrap-image/Dockerfile | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index baa57f5..8a2e3d1 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -4,14 +4,11 @@ ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 
-RUN --mount=type=secret,id=myuser \
-    export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) 
+RUN --mount=type=secret,id=myuser PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
 
 RUN --mount=type=secret,id=mytoken \
     export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
 
-RUN echo "$PENTAHO_CICD_ONE_USER"
-
 RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh

From 1a42ee46c1f3fa2b3d66a4e63cc0ff2f12a0dc24 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 14:24:34 +0530
Subject: [PATCH 73/84] [HNC-466]_Build Docker Image

---
 .github/bootstrap-image/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 8a2e3d1..e3151a0 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -4,12 +4,11 @@ ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 
-RUN --mount=type=secret,id=myuser PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
+RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
 
-RUN --mount=type=secret,id=mytoken \
-    export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
+RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && echo ${PENTAHO_CICD_ONE_KEY}
 
-RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+RUN curl -L -u${PENTAHO_CICD_ONE_USER}:${PENTAHO_CICD_ONE_KEY} -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From 3d48bdc0406b82de5654be5e4076cf5076c1239e Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 14:29:47 +0530
Subject: [PATCH 74/84] [HNC-466]-Docker Image Build

---
 .github/bootstrap-image/Dockerfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index e3151a0..b94fa27 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -6,9 +6,11 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
 
-RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && echo ${PENTAHO_CICD_ONE_KEY}
+RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
+ 
+RUN echo $PENTAHO_CICD_ONE_KEY
 
-RUN curl -L -u${PENTAHO_CICD_ONE_USER}:${PENTAHO_CICD_ONE_KEY} -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From 0021b9cda761184af0410a70e0ce6317f7a88f16 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 14:42:26 +0530
Subject: [PATCH 75/84] [HNC-466]-Docker Build Image

---
 .github/bootstrap-image/Dockerfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index b94fa27..369dc37 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -3,14 +3,20 @@ FROM one.hitachivantara.com/docker/jenkins-build/maven/open-jdk/11
 ARG VERSION_MERGER=1.0.8
 ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
+RUN --mount=type=secret,id=myuser \
+    --mount=type=secret,id=mytoken\
+    export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && \
+    export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && \
+    curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && \ 
+    mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
-RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
+# RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
 
-RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
+# RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
  
-RUN echo $PENTAHO_CICD_ONE_KEY
+# RUN echo $PENTAHO_CICD_ONE_KEY
 
-RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+# RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
 
 RUN curl -fL https://install-cli.jfrog.io | sh
 

From a1ec693223a6a313114d8a127344861f965c0be9 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 15:14:13 +0530
Subject: [PATCH 76/84] [HNC-466]-Build Docker File

---
 .github/bootstrap-image/Dockerfile | 3 +--
 version-merger.jar                 | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 version-merger.jar

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 369dc37..d7104f0 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -7,8 +7,7 @@ RUN --mount=type=secret,id=myuser \
     --mount=type=secret,id=mytoken\
     export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && \
     export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && \
-    curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && \ 
-    mv version-merger-${VERSION_MERGER}.jar version-merger.jar
+    curl -Sf -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar --output version-merger.jar
 
 # RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
 
diff --git a/version-merger.jar b/version-merger.jar
deleted file mode 100644
index a016210..0000000
--- a/version-merger.jar
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "errors" : [ {
-    "status" : 401,
-    "message" : "Bad credentials"
-  } ]
-}
\ No newline at end of file

From 43a9ea4fa702de1762afe30393eb7cf433c51b55 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 15:18:57 +0530
Subject: [PATCH 77/84] [HNC-466]-Docker Image Build

---
 .github/bootstrap-image/Dockerfile    | 4 ++--
 .github/workflows/bootstrap-image.yml | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index d7104f0..530fcb6 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -5,8 +5,8 @@ ARG ARTIFACTORY_URL=https://one.hitachivantara.com/artifactory/maven
 
 RUN --mount=type=secret,id=myuser \
     --mount=type=secret,id=mytoken\
-    export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && \
-    export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && \
+    PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && \
+    PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && \
     curl -Sf -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar --output version-merger.jar
 
 # RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 52bc5c4..8d73c3f 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -41,11 +41,10 @@ jobs:
       #   run: |
       #     docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
 
-      
-      # - name: Push to Artifactory
-      #   id: push-to-artifactory
-      #   run: |
-      #     docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
+      - name: Push to Artifactory Using buildX
+        id: push-to-artifactory
+        run: |
+          docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
               
       - name: Summary
         run: |

From 03afa3b3fb213aa69922d89ce521f9e8af23a46b Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 15:26:10 +0530
Subject: [PATCH 78/84] [HNC-466]-Docker Build

---
 .github/bootstrap-image/Dockerfile    |  8 --------
 .github/workflows/bootstrap-image.yml | 14 +++++++-------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index 530fcb6..df04007 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -9,14 +9,6 @@ RUN --mount=type=secret,id=myuser \
     PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) && \
     curl -Sf -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar --output version-merger.jar
 
-# RUN --mount=type=secret,id=myuser export PENTAHO_CICD_ONE_USER=$(cat /run/secrets/myuser) && echo ${PENTAHO_CICD_ONE_USER}
-
-# RUN --mount=type=secret,id=mytoken export PENTAHO_CICD_ONE_KEY=$(cat /run/secrets/mytoken) 
- 
-# RUN echo $PENTAHO_CICD_ONE_KEY
-
-# RUN curl -L -u$PENTAHO_CICD_ONE_USER:$PENTAHO_CICD_ONE_KEY -X GET ${ARTIFACTORY_URL}/pentaho/version-merger/${VERSION_MERGER}/version-merger-${VERSION_MERGER}.jar && mv version-merger-${VERSION_MERGER}.jar version-merger.jar
-
 RUN curl -fL https://install-cli.jfrog.io | sh
 
 ARG JQ_VERSION=1.6
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 8d73c3f..2997ec3 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -36,15 +36,15 @@ jobs:
         id: build-image
         run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=ARTIFACTORY_USER --secret id=mytoken,env=ARTIFACTORY_API_KEY .
 
-      # - name: Push to Artifactory
-      #   id: push-to-artifactory
-      #   run: |
-      #     docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
-
-      - name: Push to Artifactory Using buildX
+      - name: Push to Artifactory
         id: push-to-artifactory
         run: |
-          docker buildx build "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
+          docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
+
+      # - name: Push to Artifactory Using buildX
+      #   id: push-to-artifactory
+      #   run: |
+      #     docker buildx build ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" --push
               
       - name: Summary
         run: |

From a61c23a1e32fc87220811868ef73044c56b493a0 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 15:33:29 +0530
Subject: [PATCH 79/84] [HNC-466]-Push Docker Image

---
 .github/bootstrap-image/Dockerfile    |  1 +
 .github/workflows/bootstrap-image.yml | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/bootstrap-image/Dockerfile b/.github/bootstrap-image/Dockerfile
index df04007..ba80be8 100644
--- a/.github/bootstrap-image/Dockerfile
+++ b/.github/bootstrap-image/Dockerfile
@@ -12,6 +12,7 @@ RUN --mount=type=secret,id=myuser \
 RUN curl -fL https://install-cli.jfrog.io | sh
 
 ARG JQ_VERSION=1.6
+
 RUN curl -L -o jq-linux64 https://github.com/stedolan/jq/releases/download/jq-${JQ_VERSION}/jq-linux64 && \
     mv jq-linux64 /usr/local/bin/jq && \
     chmod +x /usr/local/bin/jq
diff --git a/.github/workflows/bootstrap-image.yml b/.github/workflows/bootstrap-image.yml
index 2997ec3..f34f59c 100644
--- a/.github/workflows/bootstrap-image.yml
+++ b/.github/workflows/bootstrap-image.yml
@@ -34,12 +34,12 @@ jobs:
           
       - name: Build
         id: build-image
-        run: docker buildx build -t "${{ env.ARTIFACTORY }}/${{ env.IMAGE }}" -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=ARTIFACTORY_USER --secret id=mytoken,env=ARTIFACTORY_API_KEY .
+        run: docker buildx build -t ${{ env.ARTIFACTORY }}/${{ env.IMAGE }} --push -f .github/bootstrap-image/Dockerfile --secret id=myuser,env=ARTIFACTORY_USER --secret id=mytoken,env=ARTIFACTORY_API_KEY .
 
-      - name: Push to Artifactory
-        id: push-to-artifactory
-        run: |
-          docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
+      # - name: Push to Artifactory
+      #   id: push-to-artifactory
+      #   run: |
+      #     docker push ${{ env.ARTIFACTORY }}/${{ env.IMAGE }}
 
       # - name: Push to Artifactory Using buildX
       #   id: push-to-artifactory

From 8335bd4a9186cfa71306615cbfe3483fb15d358d Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 16:54:23 +0530
Subject: [PATCH 80/84] [HNC-466]-changed Bootstrap Image to latest ref

---
 .github/workflows/merge.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 952dc2b..0e6e710 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -103,7 +103,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -128,7 +128,7 @@ jobs:
     runs-on: [ k8s ]
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
@@ -168,7 +168,7 @@ jobs:
       JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
 
     container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231222.61
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
       credentials:
         username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
         password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}

From 01595ac6c759aef1dbf7f99f55cc6a2efb23eeb0 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 17:09:43 +0530
Subject: [PATCH 81/84] [HNC-466]-Added One Credentials

---
 .github/workflows/merge.yml | 264 ++++++++++++++++++------------------
 1 file changed, 134 insertions(+), 130 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 0e6e710..040ae17 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -80,8 +80,12 @@ env:
 
   RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/maven
 
-  NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
-  NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
+  # NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
+  # NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
+  
+  
+  NEXUS_DEPLOY_USER: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+  NEXUS_DEPLOY_PASSWORD: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
   PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-dev
   PRIVATE_RELEASE_REPO: pntprv-maven-dev
@@ -158,136 +162,136 @@ jobs:
         env:
           cmd_type: BUILD
 
-  release-candidate:
-    name: Build Release Candidate
-    needs: setup-maven-settings
-
-    runs-on: [ k8s ]
-
-    env:
-      JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-    container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
-      credentials:
-        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
-        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
-      volumes:
-        - /home/runner/caches/pentaho/.m2:/root/.m2
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
-
-      - name: Determine which changes occurred
-        if: ${{ inputs.modules_to_build == '' }}
-        id: change_detection
-        uses: hv-actions/change-detection-builder@stable
-
-      - name: Determine version
-        id: version
-        run: |
-          version="${{ env.VERSION }}-${{ github.run_number }}"
-          echo "current-version=$version" >> $GITHUB_OUTPUT
-
-      - name: Version set
-        run: |
-          sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
-          sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
+  # release-candidate:
+  #   name: Build Release Candidate
+  #   needs: setup-maven-settings
+
+  #   runs-on: [ k8s ]
+
+  #   env:
+  #     JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+  #   container:
+  #     image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
+  #     credentials:
+  #       username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+  #       password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
+  #     volumes:
+  #       - /home/runner/caches/pentaho/.m2:/root/.m2
+  #   steps:
+
+  #     - name: Checkout code
+  #       uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 0
+
+  #     - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
+
+  #     - name: Determine which changes occurred
+  #       if: ${{ inputs.modules_to_build == '' }}
+  #       id: change_detection
+  #       uses: hv-actions/change-detection-builder@stable
+
+  #     - name: Determine version
+  #       id: version
+  #       run: |
+  #         version="${{ env.VERSION }}-${{ github.run_number }}"
+  #         echo "current-version=$version" >> $GITHUB_OUTPUT
+
+  #     - name: Version set
+  #       run: |
+  #         sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
+  #         sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
           
-          java -DRELEASE_MODE=true -jar /version-merger.jar . \
-            -f .github/release-versions.properties \
-            commit project.revision=${{ steps.version.outputs.current-version }} \
-            project.version=${{ steps.version.outputs.current-version }} \
-            version=${{ steps.version.outputs.current-version }} \
-            distribution.version=${{ steps.version.outputs.current-version }} \
-            project.stage=master
-
-      - name: Build code and deploy artifacts
-        uses: lumada-common-services/gh-composite-actions@stable
-        with:
-          command: |
-            mvn clean deploy -DskipTests \
-              -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
-              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-              -amd ${{ inputs.additional_mvn_directives }}
-        env:
-          cmd_type: BUILD
-
-      - name: Run unit-tests
-        uses: lumada-common-services/gh-composite-actions@stable
-        with:
-          command: |
-            mvn verify -B -Daudit \
-              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-              -amd
-        env:
-          cmd_type: UNIT_TEST
-          reporter: 'java-junit'
-          fail-on-error: 'true'
-          test_report_path: '**/target/surefire-reports/*.xml'
-
-      - name: Run PDI plugin integration tests
-        uses: pentaho/actions-common@stable
-        if: ${{ inputs.test_scenario_json }}
-        with:
-          changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
-          test_scenario_json: "${{ inputs.test_scenario_json }}"
-        env:
-          run_plugin_integration_tests: true
-          BASE_VERSION: "${{ inputs.base_version }}"
-
-      #- name: Blackduck Scan
-      #  uses: lumada-common-services/gh-composite-actions@1.2.0
-      #  env:
-      #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
-      #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
-      #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
-      #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
-      #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
-
-      - name: Sonarqube scan
-        continue-on-error: true
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          sonar_utility: sonar-scanner
-          sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
-
-      - name: Tag release
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          Tag_version: "${{ steps.version.outputs.current-version }}"
-          push_tag_only: true
-
-      - name: Create artifacts download links
-        shell: bash
-        run: |
-          jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
-            --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
-            --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
-            --user ${{ env.NEXUS_DEPLOY_USER }}
+  #         java -DRELEASE_MODE=true -jar /version-merger.jar . \
+  #           -f .github/release-versions.properties \
+  #           commit project.revision=${{ steps.version.outputs.current-version }} \
+  #           project.version=${{ steps.version.outputs.current-version }} \
+  #           version=${{ steps.version.outputs.current-version }} \
+  #           distribution.version=${{ steps.version.outputs.current-version }} \
+  #           project.stage=master
+
+  #     - name: Build code and deploy artifacts
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       with:
+  #         command: |
+  #           mvn clean deploy -DskipTests \
+  #             -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
+  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+  #             -amd ${{ inputs.additional_mvn_directives }}
+  #       env:
+  #         cmd_type: BUILD
+
+  #     - name: Run unit-tests
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       with:
+  #         command: |
+  #           mvn verify -B -Daudit \
+  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+  #             -amd
+  #       env:
+  #         cmd_type: UNIT_TEST
+  #         reporter: 'java-junit'
+  #         fail-on-error: 'true'
+  #         test_report_path: '**/target/surefire-reports/*.xml'
+
+  #     - name: Run PDI plugin integration tests
+  #       uses: pentaho/actions-common@stable
+  #       if: ${{ inputs.test_scenario_json }}
+  #       with:
+  #         changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
+  #         test_scenario_json: "${{ inputs.test_scenario_json }}"
+  #       env:
+  #         run_plugin_integration_tests: true
+  #         BASE_VERSION: "${{ inputs.base_version }}"
+
+  #     #- name: Blackduck Scan
+  #     #  uses: lumada-common-services/gh-composite-actions@1.2.0
+  #     #  env:
+  #     #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
+  #     #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
+  #     #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
+  #     #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
+  #     #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
+
+  #     - name: Sonarqube scan
+  #       continue-on-error: true
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         sonar_utility: sonar-scanner
+  #         sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
+
+  #     - name: Tag release
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         Tag_version: "${{ steps.version.outputs.current-version }}"
+  #         push_tag_only: true
+
+  #     - name: Create artifacts download links
+  #       shell: bash
+  #       run: |
+  #         jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
+  #           --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
+  #           --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
+  #           --user ${{ env.NEXUS_DEPLOY_USER }}
           
-          resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
-            "*-${{ steps.version.outputs.current-version }}.zip")
+  #         resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
+  #           "*-${{ steps.version.outputs.current-version }}.zip")
           
-          echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
-          echo "|:----:|" >> $GITHUB_STEP_SUMMARY
+  #         echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
+  #         echo "|:----:|" >> $GITHUB_STEP_SUMMARY
           
-          echo "$resp" | jq -r '.[].path' | while read -r path; do
-            link_text=$(echo "$path" | sed 's/.*\///')
-            echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
-          done
+  #         echo "$resp" | jq -r '.[].path' | while read -r path; do
+  #           link_text=$(echo "$path" | sed 's/.*\///')
+  #           echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
+  #         done
           
-          echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
-
-      - name: Report notifications
-        if: always()
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          Slack_Token: ${{ secrets.SLACK_TOKEN }}
-          Slack_Channel: ${{ env.SLACK_CHANNEL }}
-          report: true
+  #         echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
+
+  #     - name: Report notifications
+  #       if: always()
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         Slack_Token: ${{ secrets.SLACK_TOKEN }}
+  #         Slack_Channel: ${{ env.SLACK_CHANNEL }}
+  #         report: true

From d7f9b517deb4a7d5acfa3b29fefc6fb063929714 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 17:37:07 +0530
Subject: [PATCH 82/84] [HNC-466]-Testing

---
 .github/workflows/merge.yml | 256 ++++++++++++++++++------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 040ae17..73124e2 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -162,136 +162,136 @@ jobs:
         env:
           cmd_type: BUILD
 
-  # release-candidate:
-  #   name: Build Release Candidate
-  #   needs: setup-maven-settings
-
-  #   runs-on: [ k8s ]
-
-  #   env:
-  #     JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-  #   container:
-  #     image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
-  #     credentials:
-  #       username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
-  #       password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
-  #     volumes:
-  #       - /home/runner/caches/pentaho/.m2:/root/.m2
-  #   steps:
-
-  #     - name: Checkout code
-  #       uses: actions/checkout@v3
-  #       with:
-  #         fetch-depth: 0
-
-  #     - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
-
-  #     - name: Determine which changes occurred
-  #       if: ${{ inputs.modules_to_build == '' }}
-  #       id: change_detection
-  #       uses: hv-actions/change-detection-builder@stable
-
-  #     - name: Determine version
-  #       id: version
-  #       run: |
-  #         version="${{ env.VERSION }}-${{ github.run_number }}"
-  #         echo "current-version=$version" >> $GITHUB_OUTPUT
-
-  #     - name: Version set
-  #       run: |
-  #         sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
-  #         sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
+  release-candidate:
+    name: Build Release Candidate
+    needs: setup-maven-settings
+
+    runs-on: [ k8s ]
+
+    env:
+      JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+    container:
+      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
+      credentials:
+        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
+      volumes:
+        - /home/runner/caches/pentaho/.m2:/root/.m2
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
+
+      - name: Determine which changes occurred
+        if: ${{ inputs.modules_to_build == '' }}
+        id: change_detection
+        uses: hv-actions/change-detection-builder@stable
+
+      - name: Determine version
+        id: version
+        run: |
+          version="${{ env.VERSION }}-${{ github.run_number }}"
+          echo "current-version=$version" >> $GITHUB_OUTPUT
+
+      - name: Version set
+        run: |
+          sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
+          sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
           
-  #         java -DRELEASE_MODE=true -jar /version-merger.jar . \
-  #           -f .github/release-versions.properties \
-  #           commit project.revision=${{ steps.version.outputs.current-version }} \
-  #           project.version=${{ steps.version.outputs.current-version }} \
-  #           version=${{ steps.version.outputs.current-version }} \
-  #           distribution.version=${{ steps.version.outputs.current-version }} \
-  #           project.stage=master
-
-  #     - name: Build code and deploy artifacts
-  #       uses: lumada-common-services/gh-composite-actions@stable
-  #       with:
-  #         command: |
-  #           mvn clean deploy -DskipTests \
-  #             -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
-  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-  #             -amd ${{ inputs.additional_mvn_directives }}
-  #       env:
-  #         cmd_type: BUILD
-
-  #     - name: Run unit-tests
-  #       uses: lumada-common-services/gh-composite-actions@stable
-  #       with:
-  #         command: |
-  #           mvn verify -B -Daudit \
-  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-  #             -amd
-  #       env:
-  #         cmd_type: UNIT_TEST
-  #         reporter: 'java-junit'
-  #         fail-on-error: 'true'
-  #         test_report_path: '**/target/surefire-reports/*.xml'
-
-  #     - name: Run PDI plugin integration tests
-  #       uses: pentaho/actions-common@stable
-  #       if: ${{ inputs.test_scenario_json }}
-  #       with:
-  #         changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
-  #         test_scenario_json: "${{ inputs.test_scenario_json }}"
-  #       env:
-  #         run_plugin_integration_tests: true
-  #         BASE_VERSION: "${{ inputs.base_version }}"
-
-  #     #- name: Blackduck Scan
-  #     #  uses: lumada-common-services/gh-composite-actions@1.2.0
-  #     #  env:
-  #     #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
-  #     #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
-  #     #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
-  #     #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
-  #     #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
-
-  #     - name: Sonarqube scan
-  #       continue-on-error: true
-  #       uses: lumada-common-services/gh-composite-actions@stable
-  #       env:
-  #         sonar_utility: sonar-scanner
-  #         sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
-
-  #     - name: Tag release
-  #       uses: lumada-common-services/gh-composite-actions@stable
-  #       env:
-  #         Tag_version: "${{ steps.version.outputs.current-version }}"
-  #         push_tag_only: true
-
-  #     - name: Create artifacts download links
-  #       shell: bash
-  #       run: |
-  #         jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
-  #           --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
-  #           --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
-  #           --user ${{ env.NEXUS_DEPLOY_USER }}
+          java -DRELEASE_MODE=true -jar /version-merger.jar . \
+            -f .github/release-versions.properties \
+            commit project.revision=${{ steps.version.outputs.current-version }} \
+            project.version=${{ steps.version.outputs.current-version }} \
+            version=${{ steps.version.outputs.current-version }} \
+            distribution.version=${{ steps.version.outputs.current-version }} \
+            project.stage=master
+
+      - name: Build code and deploy artifacts
+        uses: lumada-common-services/gh-composite-actions@stable
+        with:
+          command: |
+            mvn clean deploy -DskipTests \
+              -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
+              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+              -amd ${{ inputs.additional_mvn_directives }}
+        env:
+          cmd_type: BUILD
+
+      - name: Run unit-tests
+        uses: lumada-common-services/gh-composite-actions@stable
+        with:
+          command: |
+            mvn verify -B -Daudit \
+              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+              -amd
+        env:
+          cmd_type: UNIT_TEST
+          reporter: 'java-junit'
+          fail-on-error: 'true'
+          test_report_path: '**/target/surefire-reports/*.xml'
+
+      - name: Run PDI plugin integration tests
+        uses: pentaho/actions-common@stable
+        if: ${{ inputs.test_scenario_json }}
+        with:
+          changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
+          test_scenario_json: "${{ inputs.test_scenario_json }}"
+        env:
+          run_plugin_integration_tests: true
+          BASE_VERSION: "${{ inputs.base_version }}"
+
+      #- name: Blackduck Scan
+      #  uses: lumada-common-services/gh-composite-actions@1.2.0
+      #  env:
+      #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
+      #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
+      #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
+      #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
+      #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
+
+      - name: Sonarqube scan
+        continue-on-error: true
+        uses: lumada-common-services/gh-composite-actions@stable
+        env:
+          sonar_utility: sonar-scanner
+          sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
+
+      - name: Tag release
+        uses: lumada-common-services/gh-composite-actions@stable
+        env:
+          Tag_version: "${{ steps.version.outputs.current-version }}"
+          push_tag_only: true
+
+      - name: Create artifacts download links
+        shell: bash
+        run: |
+          jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
+            --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
+            --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
+            --user ${{ env.NEXUS_DEPLOY_USER }}
           
-  #         resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
-  #           "*-${{ steps.version.outputs.current-version }}.zip")
+          resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
+            "*-${{ steps.version.outputs.current-version }}.zip")
           
-  #         echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
-  #         echo "|:----:|" >> $GITHUB_STEP_SUMMARY
+          echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
+          echo "|:----:|" >> $GITHUB_STEP_SUMMARY
           
-  #         echo "$resp" | jq -r '.[].path' | while read -r path; do
-  #           link_text=$(echo "$path" | sed 's/.*\///')
-  #           echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
-  #         done
+          echo "$resp" | jq -r '.[].path' | while read -r path; do
+            link_text=$(echo "$path" | sed 's/.*\///')
+            echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
+          done
           
-  #         echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
-
-  #     - name: Report notifications
-  #       if: always()
-  #       uses: lumada-common-services/gh-composite-actions@stable
-  #       env:
-  #         Slack_Token: ${{ secrets.SLACK_TOKEN }}
-  #         Slack_Channel: ${{ env.SLACK_CHANNEL }}
-  #         report: true
+          echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
+
+      - name: Report notifications
+        if: always()
+        uses: lumada-common-services/gh-composite-actions@stable
+        env:
+          Slack_Token: ${{ secrets.SLACK_TOKEN }}
+          Slack_Channel: ${{ env.SLACK_CHANNEL }}
+          report: true

From 482c4caef6c28f4e860927f8202eb48c08784b75 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 19:33:53 +0530
Subject: [PATCH 83/84] [HNC-466]-Testing

---
 .github/workflows/merge.yml | 256 ++++++++++++++++++------------------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 73124e2..040ae17 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -162,136 +162,136 @@ jobs:
         env:
           cmd_type: BUILD
 
-  release-candidate:
-    name: Build Release Candidate
-    needs: setup-maven-settings
-
-    runs-on: [ k8s ]
-
-    env:
-      JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-    container:
-      image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
-      credentials:
-        username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
-        password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
-      volumes:
-        - /home/runner/caches/pentaho/.m2:/root/.m2
-    steps:
-
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
-
-      - name: Determine which changes occurred
-        if: ${{ inputs.modules_to_build == '' }}
-        id: change_detection
-        uses: hv-actions/change-detection-builder@stable
-
-      - name: Determine version
-        id: version
-        run: |
-          version="${{ env.VERSION }}-${{ github.run_number }}"
-          echo "current-version=$version" >> $GITHUB_OUTPUT
-
-      - name: Version set
-        run: |
-          sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
-          sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
+  # release-candidate:
+  #   name: Build Release Candidate
+  #   needs: setup-maven-settings
+
+  #   runs-on: [ k8s ]
+
+  #   env:
+  #     JFROG_CLI_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+  #   container:
+  #     image: one.hitachivantara.com/devops-docker-release/pentaho/actions-common:20231226.106
+  #     credentials:
+  #       username: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+  #       password: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
+  #     volumes:
+  #       - /home/runner/caches/pentaho/.m2:/root/.m2
+  #   steps:
+
+  #     - name: Checkout code
+  #       uses: actions/checkout@v3
+  #       with:
+  #         fetch-depth: 0
+
+  #     - run: git config --global --add safe.directory /__w/${{ github.event.repository.name }}/${{ github.event.repository.name }}
+
+  #     - name: Determine which changes occurred
+  #       if: ${{ inputs.modules_to_build == '' }}
+  #       id: change_detection
+  #       uses: hv-actions/change-detection-builder@stable
+
+  #     - name: Determine version
+  #       id: version
+  #       run: |
+  #         version="${{ env.VERSION }}-${{ github.run_number }}"
+  #         echo "current-version=$version" >> $GITHUB_OUTPUT
+
+  #     - name: Version set
+  #       run: |
+  #         sed -i 's/BASE_VERSION/${{ env.BASE_VERSION }}/g' .github/release-versions.properties
+  #         sed -i 's/BUILD_NBR/${{ github.run_number }}/g' .github/release-versions.properties
           
-          java -DRELEASE_MODE=true -jar /version-merger.jar . \
-            -f .github/release-versions.properties \
-            commit project.revision=${{ steps.version.outputs.current-version }} \
-            project.version=${{ steps.version.outputs.current-version }} \
-            version=${{ steps.version.outputs.current-version }} \
-            distribution.version=${{ steps.version.outputs.current-version }} \
-            project.stage=master
-
-      - name: Build code and deploy artifacts
-        uses: lumada-common-services/gh-composite-actions@stable
-        with:
-          command: |
-            mvn clean deploy -DskipTests \
-              -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
-              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-              -amd ${{ inputs.additional_mvn_directives }}
-        env:
-          cmd_type: BUILD
-
-      - name: Run unit-tests
-        uses: lumada-common-services/gh-composite-actions@stable
-        with:
-          command: |
-            mvn verify -B -Daudit \
-              -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
-              -amd
-        env:
-          cmd_type: UNIT_TEST
-          reporter: 'java-junit'
-          fail-on-error: 'true'
-          test_report_path: '**/target/surefire-reports/*.xml'
-
-      - name: Run PDI plugin integration tests
-        uses: pentaho/actions-common@stable
-        if: ${{ inputs.test_scenario_json }}
-        with:
-          changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
-          test_scenario_json: "${{ inputs.test_scenario_json }}"
-        env:
-          run_plugin_integration_tests: true
-          BASE_VERSION: "${{ inputs.base_version }}"
-
-      #- name: Blackduck Scan
-      #  uses: lumada-common-services/gh-composite-actions@1.2.0
-      #  env:
-      #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
-      #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
-      #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
-      #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
-      #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
-
-      - name: Sonarqube scan
-        continue-on-error: true
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          sonar_utility: sonar-scanner
-          sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
-
-      - name: Tag release
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          Tag_version: "${{ steps.version.outputs.current-version }}"
-          push_tag_only: true
-
-      - name: Create artifacts download links
-        shell: bash
-        run: |
-          jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
-            --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
-            --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
-            --user ${{ env.NEXUS_DEPLOY_USER }}
+  #         java -DRELEASE_MODE=true -jar /version-merger.jar . \
+  #           -f .github/release-versions.properties \
+  #           commit project.revision=${{ steps.version.outputs.current-version }} \
+  #           project.version=${{ steps.version.outputs.current-version }} \
+  #           version=${{ steps.version.outputs.current-version }} \
+  #           distribution.version=${{ steps.version.outputs.current-version }} \
+  #           project.stage=master
+
+  #     - name: Build code and deploy artifacts
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       with:
+  #         command: |
+  #           mvn clean deploy -DskipTests \
+  #             -Pcicd-release -Drelease -Dbuild.name=${{ env.BUILD_NAME }} -Dbuild.number=${{ github.run_number }} \
+  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+  #             -amd ${{ inputs.additional_mvn_directives }}
+  #       env:
+  #         cmd_type: BUILD
+
+  #     - name: Run unit-tests
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       with:
+  #         command: |
+  #           mvn verify -B -Daudit \
+  #             -pl "${{ inputs.modules_to_build || format('{0},{1}', inputs.modules_to_always_build, steps.change_detection.outputs.changed_modules) }}" \
+  #             -amd
+  #       env:
+  #         cmd_type: UNIT_TEST
+  #         reporter: 'java-junit'
+  #         fail-on-error: 'true'
+  #         test_report_path: '**/target/surefire-reports/*.xml'
+
+  #     - name: Run PDI plugin integration tests
+  #       uses: pentaho/actions-common@stable
+  #       if: ${{ inputs.test_scenario_json }}
+  #       with:
+  #         changed_modules: "${{ steps.change_detection.outputs.changed_modules }}"
+  #         test_scenario_json: "${{ inputs.test_scenario_json }}"
+  #       env:
+  #         run_plugin_integration_tests: true
+  #         BASE_VERSION: "${{ inputs.base_version }}"
+
+  #     #- name: Blackduck Scan
+  #     #  uses: lumada-common-services/gh-composite-actions@1.2.0
+  #     #  env:
+  #     #    BlackDuck_Project_Version: ${{ steps.version.outputs.current-version }}
+  #     #    BlackDuck_Project_Name: "${{ inputs.blackduck_project_key }}"
+  #     #    BlackDuck_Api_Token: "${{ secrets.ORION_BLACKDUCK_TOKEN }}"
+  #     #    BlackDuck_Url: "${{ inputs.blackduck_server_url }}"
+  #     #    ADDITIONAL_ARGS: ${{ inputs.blackduck_additional_args }}
+
+  #     - name: Sonarqube scan
+  #       continue-on-error: true
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         sonar_utility: sonar-scanner
+  #         sonar_commands: '("-Dsonar.projectKey=${{env.SONAR_PROJECT_KEY}} -Dsonar.host.url=${{env.SONAR_HOST_URL}} -Dsonar.login=${{env.SONAR_LOGIN}}")'
+
+  #     - name: Tag release
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         Tag_version: "${{ steps.version.outputs.current-version }}"
+  #         push_tag_only: true
+
+  #     - name: Create artifacts download links
+  #       shell: bash
+  #       run: |
+  #         jf config add artifactory --interactive=false --enc-password=false --basic-auth-only \
+  #           --artifactory-url ${{ env.ARTIFACTORY_BASE_URL }} \
+  #           --password ${{ env.NEXUS_DEPLOY_PASSWORD }} \
+  #           --user ${{ env.NEXUS_DEPLOY_USER }}
           
-          resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
-            "*-${{ steps.version.outputs.current-version }}.zip")
+  #         resp=$(jf rt search --props "build.name=${{ env.BUILD_NAME }};build.number=${{ github.run_number }}" \
+  #           "*-${{ steps.version.outputs.current-version }}.zip")
           
-          echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
-          echo "|:----:|" >> $GITHUB_STEP_SUMMARY
+  #         echo "| :gift: Files |" >> $GITHUB_STEP_SUMMARY
+  #         echo "|:----:|" >> $GITHUB_STEP_SUMMARY
           
-          echo "$resp" | jq -r '.[].path' | while read -r path; do
-            link_text=$(echo "$path" | sed 's/.*\///')
-            echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
-          done
+  #         echo "$resp" | jq -r '.[].path' | while read -r path; do
+  #           link_text=$(echo "$path" | sed 's/.*\///')
+  #           echo "| [ $link_text ](${{ env.ARTIFACTORY_BASE_URL }}/$path) |" >> $GITHUB_STEP_SUMMARY; 
+  #         done
           
-          echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
-
-      - name: Report notifications
-        if: always()
-        uses: lumada-common-services/gh-composite-actions@stable
-        env:
-          Slack_Token: ${{ secrets.SLACK_TOKEN }}
-          Slack_Channel: ${{ env.SLACK_CHANNEL }}
-          report: true
+  #         echo "|[Full artifacts list](${{ env.ARTIFACTORY_HOST }}/ui/builds/${{ env.BUILD_NAME }}/${{ github.run_number }})|" >> $GITHUB_STEP_SUMMARY
+
+  #     - name: Report notifications
+  #       if: always()
+  #       uses: lumada-common-services/gh-composite-actions@stable
+  #       env:
+  #         Slack_Token: ${{ secrets.SLACK_TOKEN }}
+  #         Slack_Channel: ${{ env.SLACK_CHANNEL }}
+  #         report: true

From c10ec4e9ac88f9d02ac6e9407ef1c58f9c94eb95 Mon Sep 17 00:00:00 2001
From: mayur-hitachivantara <mayur.kadam@hitachivantara.com>
Date: Tue, 26 Dec 2023 19:49:25 +0530
Subject: [PATCH 84/84] [HNC-466]-Testing

---
 .github/workflows/merge.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 040ae17..91dfdff 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -80,12 +80,11 @@ env:
 
   RESOLVE_REPO_MIRROR: ${ARTIFACTORY_BASE_URL}/maven
 
-  # NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
-  # NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
+  NEXUS_DEPLOY_USER: ${{ secrets.ARTIFACTORY_USER }}
+  NEXUS_DEPLOY_PASSWORD: ${{ secrets.ARTIFACTORY_API_KEY }}
   
-  
-  NEXUS_DEPLOY_USER: ${{ secrets.PENTAHO_CICD_ONE_USER }}
-  NEXUS_DEPLOY_PASSWORD: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
+  # NEXUS_DEPLOY_USER: ${{ secrets.PENTAHO_CICD_ONE_USER }}
+  # NEXUS_DEPLOY_PASSWORD: ${{ secrets.PENTAHO_CICD_ONE_KEY }}
 
   PUBLIC_RELEASE_REPO_URL: ${ARTIFACTORY_BASE_URL}/pntpub-maven-dev
   PRIVATE_RELEASE_REPO: pntprv-maven-dev