From 0f2840a1a5cf06ee7121f4c75ca7e5bf9655d6b7 Mon Sep 17 00:00:00 2001
From: JinwooHwang <jinwoo@apache.org>
Date: Fri, 23 Oct 2026 09:44:06 -0400
Subject: [PATCH 1/2] GEODE-10683: Upgrade Testcontainers to 1.21.4

---
 .../apache/geode/gradle/plugins/DependencyConstraints.groovy    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index ff12f766b9f..87039f1dfd2 100644
--- a/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/build-tools/geode-dependency-management/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -224,7 +224,7 @@ class DependencyConstraints {
         api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: get('springhateoas.version'))
         api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: get('springldap.version'))
         api(group: 'org.springframework.shell', name: 'spring-shell-starter', version: get('springshell.version'))
-        api(group: 'org.testcontainers', name: 'testcontainers', version: '1.21.3')
+        api(group: 'org.testcontainers', name: 'testcontainers', version: '1.21.4')
         api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
         api(group: 'xerces', name: 'xercesImpl', version: '2.12.0')
         api(group: 'xml-apis', name: 'xml-apis', version: '1.4.01')

From e7407b031d4988d31c63ae36baa8ca000ae1a20c Mon Sep 17 00:00:00 2001
From: JinwooHwang <jinwoo@apache.org>
Date: Fri, 23 Oct 2026 09:44:12 -0400
Subject: [PATCH 2/2] GEODE-10682: Pin CI runners to ubuntu-24.04

---
 .github/workflows/gradle.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index be35375c019..9c9102332a0 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -28,7 +28,7 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
     steps:
@@ -50,7 +50,7 @@ jobs:
      strategy:
        fail-fast: false
        matrix:
-         os: [ubuntu-latest]
+         os: [ubuntu-24.04]
          distribution: [ 'liberica' ]
          java: ['17']
      runs-on: ${{ matrix.os }}
@@ -89,7 +89,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-       os: [ubuntu-latest]
+       os: [ubuntu-24.04]
        distribution: ['liberica']
        java: ['17']
    runs-on: ${{ matrix.os }}
@@ -138,7 +138,7 @@ jobs:
      needs: [apiCheck, unitTest]
      strategy:
        matrix:
-         os: [ubuntu-latest]
+         os: [ubuntu-24.04]
          distribution: ['liberica']
          java: ['17']
      runs-on: ${{ matrix.os }}
@@ -185,7 +185,7 @@ jobs:
     needs: [apiCheck, unitTest]
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         distribution: ['liberica']
         java: ['17']
     runs-on: ${{ matrix.os }}
@@ -229,7 +229,7 @@ jobs:
     needs: [apiCheck, unitTest]
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         distribution: ['liberica']
         java: ['17']
     runs-on: ${{ matrix.os }}
@@ -275,7 +275,7 @@ jobs:
     needs: [apiCheck, unitTest]
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         distribution: ['liberica']
         java: ['17']
     runs-on: ${{ matrix.os }}
@@ -319,7 +319,7 @@ jobs:
     needs: [apiCheck, unitTest]
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         distribution: ['liberica']
         java: ['17']
     runs-on: ${{ matrix.os }}
@@ -365,7 +365,7 @@ jobs:
     needs: [apiCheck, unitTest]
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-24.04]
         distribution: ['liberica']
         java: ['17']
     runs-on: ${{ matrix.os }}
@@ -413,7 +413,7 @@ jobs:
     needs: [ apiCheck, unitTest ]
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
+        os: [ ubuntu-24.04 ]
         distribution: [ 'liberica' ]
         java: [ '17' ]
     runs-on: ${{ matrix.os }}