From 02568f8d907c515fbaec8dbe24d5b3aa304077a7 Mon Sep 17 00:00:00 2001
From: Fernanda Meheust <fernanda.meheust@oracle.com>
Date: Wed, 7 Jan 2026 17:18:11 +0100
Subject: [PATCH 1/3] Upgraded devops image to ol8

---
 constants.tf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/constants.tf b/constants.tf
index f066ab5..706eb93 100644
--- a/constants.tf
+++ b/constants.tf
@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 variable "devops_pipeline_image" {
   type = string
-  default = "OL7_X86_64_STANDARD_10"
+  default = "OL8_X86_64_STANDARD_10"
 }
 
 variable "devops_deploy_shape" {

From 19fbe660f4c8ddff535a887364e9048e1e626279 Mon Sep 17 00:00:00 2001
From: Fernanda Meheust <fernanda.meheust@oracle.com>
Date: Fri, 9 Jan 2026 13:20:03 +0100
Subject: [PATCH 2/3] Don't install java or gradle

---
 java/build-repo.yaml.template | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/java/build-repo.yaml.template b/java/build-repo.yaml.template
index e73c542..592955f 100644
--- a/java/build-repo.yaml.template
+++ b/java/build-repo.yaml.template
@@ -7,38 +7,10 @@ component: build
 timeoutInSeconds: 3600
 shell: bash
 env:
-  variables:
-    JAVA_HOME : "/usr/java/latest"
   vaultVariables:
     DB_USER_PASSWORD : "${db_user_password}"
     WALLET_PASSWORD : "${wallet_password}"
 steps: 
-  - type: Command
-    name: Install Java
-    timeoutInSeconds: 600
-    failImmediatelyOnError: true
-    command: |
-      yum --enablerepo=ol7_oci_included clean metadata
-      yum install -y jdk-17
-    onFailure:
-      - type: Command
-        command: |
-          echo $JAVA_HOME
-        timeoutInSeconds: 400
-  - type: Command
-    name: Install Gradle
-    timeoutInSeconds: 600
-    failImmediatelyOnError: true
-    command: |
-      curl -o gradle-8.5-bin.zip "https://services.gradle.org/distributions/gradle-8.5-bin.zip" -L
-      mkdir /opt/gradle
-      unzip -d /opt/gradle gradle-8.5-bin.zip
-      export PATH=/opt/gradle/gradle-8.5/bin:$PATH
-    onFailure:
-      - type: Command
-        command: |
-          ls
-        timeoutInSeconds: 400
   - type: Command
     name: Build application
     timeoutInSeconds: 600

From 42430d9e9134beb754834ac79ed3d4f7005f7dfc Mon Sep 17 00:00:00 2001
From: Fernanda Meheust <fernanda.meheust@oracle.com>
Date: Fri, 9 Jan 2026 17:20:28 +0100
Subject: [PATCH 3/3] Updated java version to 24 and set path. Increased build
 pipeline timeout.

---
 devops.tf                     |  4 ++--
 java/build-repo.yaml.template | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/devops.tf b/devops.tf
index a314392..c550814 100644
--- a/devops.tf
+++ b/devops.tf
@@ -138,7 +138,7 @@ resource "oci_devops_build_pipeline_stage" "repo_build_pipeline_stage" {
   image = var.devops_pipeline_image
   is_pass_all_parameters_enabled = false
   primary_build_source = oci_devops_repository.config_repo[0].name
-  stage_execution_timeout_in_seconds = 300
+  stage_execution_timeout_in_seconds = 3000
   count = local.use-repository ? 1 : 0
 }
 
@@ -173,7 +173,7 @@ resource "oci_devops_build_pipeline_stage" "art_build_pipeline_stage" {
   image = var.devops_pipeline_image
   is_pass_all_parameters_enabled = false
   primary_build_source = oci_devops_repository.config_repo[0].name
-  stage_execution_timeout_in_seconds = 300
+  stage_execution_timeout_in_seconds = 3000
   count = local.use-artifact ? 1 : 0
 }
 
diff --git a/java/build-repo.yaml.template b/java/build-repo.yaml.template
index 592955f..ff225fb 100644
--- a/java/build-repo.yaml.template
+++ b/java/build-repo.yaml.template
@@ -7,10 +7,38 @@ component: build
 timeoutInSeconds: 3600
 shell: bash
 env:
+  variables:
+    JAVA_HOME : "/usr/java/latest"
   vaultVariables:
     DB_USER_PASSWORD : "${db_user_password}"
     WALLET_PASSWORD : "${wallet_password}"
 steps: 
+  - type: Command
+    name: Install Java
+    timeoutInSeconds: 600
+    failImmediatelyOnError: true
+    command: |
+      dnf install -y jdk-24-headful --enablerepo=ol8_oci_included
+      export PATH=$JAVA_HOME/bin:$PATH
+    onFailure:
+      - type: Command
+        command: |
+          echo $JAVA_HOME
+        timeoutInSeconds: 400
+  - type: Command
+    name: Install Gradle
+    timeoutInSeconds: 600
+    failImmediatelyOnError: true
+    command: |
+      curl -o gradle-8.5-bin.zip "https://services.gradle.org/distributions/gradle-8.5-bin.zip" -L
+      mkdir /opt/gradle
+      unzip -d /opt/gradle gradle-8.5-bin.zip
+      export PATH=/opt/gradle/gradle-8.5/bin:$PATH
+    onFailure:
+      - type: Command
+        command: |
+          ls
+        timeoutInSeconds: 400
   - type: Command
     name: Build application
     timeoutInSeconds: 600