From c3f38a8b1a2614784e0193c9150c075c2dafebca Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Mon, 21 Apr 2025 12:21:31 -0700
Subject: [PATCH 1/5] Update base image to ubi 3.12

---
 .one-pipeline.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml
index 0bb1575d..66ba6fae 100644
--- a/.one-pipeline.yaml
+++ b/.one-pipeline.yaml
@@ -32,7 +32,7 @@ setup:
 
 test:
   abort_on_failure: true
-  image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.12@sha256:ff4053b0bca784d6d105fee1d008cfb20db206011453071e86b69ca3fde706a4
+  image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
   script: |
     #!/usr/bin/env bash
     SKIP_UNIT_TESTS=$(get_env SKIP_UNIT_TESTS)
@@ -72,7 +72,7 @@ static-scan:
 containerize:
   abort_on_failure: true
   dind: true
-  image: icr.io/continuous-delivery/pipeline/pipeline-base-image:2.12@sha256:ff4053b0bca784d6d105fee1d008cfb20db206011453071e86b69ca3fde706a4
+  image: icr.io/continuous-delivery/pipeline/pipeline-base-ubi:3.12
   script: |
     #!/usr/bin/env bash
 

From e2c3d407488dc7425dc990997f7f1837cbe9c849 Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Tue, 22 Apr 2025 07:28:32 -0700
Subject: [PATCH 2/5] Add maven-war-plugin

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index bf6660f8..6fb242fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,6 +97,11 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>3.4.0</version>
+      </plugin>
     </plugins>
   </build>
 </project>
\ No newline at end of file

From 8fca3b47ad35ef903f29b01b5fd36cdd063667e3 Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Tue, 22 Apr 2025 08:31:42 -0700
Subject: [PATCH 3/5] Remove apt

---
 .one-pipeline.yaml | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/.one-pipeline.yaml b/.one-pipeline.yaml
index 66ba6fae..e50c5073 100644
--- a/.one-pipeline.yaml
+++ b/.one-pipeline.yaml
@@ -82,20 +82,11 @@ containerize:
       set -x
     fi
 
-    apt-get update
-    apt-get -qq -y install build-essential software-properties-common uidmap
-
-    # Download and install skopeo
-    if ! command -v skopeo &> /dev/null; then
-      if [ ! -f "/apt/sources.list.d/devel:kubic:libcontainers:stable.list" ]; then
-        sudo sh -c "echo 'deb http://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/xUbuntu_18.04/ /' > /etc/apt/sources.list.d/devel:kubic:libcontainers:stable.list"
-        wget --no-check-certificate -nv https://download.opensuse.org/repositories/devel:kubic:libcontainers:stable/xUbuntu_18.04/Release.key -O- | sudo apt-key add -
-        sudo apt-get update -qq
-      fi
-      sudo apt-get -y install skopeo
-    else
-      skopeo --version
-    fi
+    yum -y -q update
+
+    # Check skopeo version
+    echo "skopeo version"
+    skopeo --version || exit 1
 
     # Build images
     export PIPELINE_USERNAME=$(get_env ibmcloud-api-user)

From c110dc003425ca47e84fbae6603d1d12c1d0cd53 Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Tue, 22 Apr 2025 10:58:23 -0700
Subject: [PATCH 4/5] Update resteasy-json-binding-provider

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

diff --git a/pom.xml b/pom.xml
index 6fb242fe..e86df5af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
         <groupId>org.jboss.resteasy</groupId>
         <artifactId>resteasy-json-binding-provider</artifactId>
-        <version>6.2.3.Final</version>
+        <version>6.2.12.Final</version>
         <scope>test</scope>
     </dependency>
     <dependency>

From a37a77623e1bb8aecf41b893cb105590f7e8c244 Mon Sep 17 00:00:00 2001
From: Melissa Lee <halim.lee@ibm.com>
Date: Tue, 22 Apr 2025 11:23:10 -0700
Subject: [PATCH 5/5] Update resteasy-client

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

diff --git a/pom.xml b/pom.xml
index e86df5af..47869ea5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-client</artifactId>
-      <version>6.2.3.Final</version>
+      <version>6.2.12.Final</version>
       <scope>test</scope>
     </dependency>
     <dependency>