Merge branch 'apache:master' into master

.asf.yaml

@@ -49,6 +49,8 @@ github:
 
   protected_branches:
     master: {}
+    release-2.59.0: {}
+    release-2.58.1: {}
     release-2.58.0: {}
     release-2.57.0: {}
     release-2.56.0: {}

.github/actions/setup-environment-action/action.yml

@@ -48,7 +48,7 @@ runs:
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: ${{ inputs.java-version == 'default' && '8' || inputs.java-version }}
+        java-version: ${{ inputs.java-version == 'default' && '11' || inputs.java-version }}
     - name: Setup Gradle
       uses: gradle/gradle-build-action@v2
       with:

.github/gh-actions-self-hosted-runners/arc/environments/beam.env

@@ -35,7 +35,7 @@ service_account_id = "[email protected]
 runner_group = "beam"
 main_runner = {
     name = "main-runner"
-    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:21129a41e031c150c3f610639d71a95a3a941243"
+    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:3063b55757509dad1c14751c9f2aa5905826d9a0"
     machine_type = "e2-standard-16"
     min_node_count = "1"
     max_node_count = "30"
@@ -51,7 +51,7 @@ main_runner = {
 additional_runner_pools = [{
     name = "small-runner"
     machine_type = "e2-standard-2"
-    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:21129a41e031c150c3f610639d71a95a3a941243"
+    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:3063b55757509dad1c14751c9f2aa5905826d9a0"
     min_node_count = "1"
     max_node_count = "15"
     min_replicas = "1"
@@ -68,7 +68,7 @@ additional_runner_pools = [{
 {
     name = "highmem-runner"
     machine_type = "c3-highmem-8"
-    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:21129a41e031c150c3f610639d71a95a3a941243"
+    runner_image = "us-central1-docker.pkg.dev/apache-beam-testing/beam-github-actions/beam-arc-runner:3063b55757509dad1c14751c9f2aa5905826d9a0"
     min_node_count = "1"
     max_node_count = "15"
     min_replicas = "1"

.github/gh-actions-self-hosted-runners/arc/images/Dockerfile

@@ -37,16 +37,16 @@ RUN curl -OL https://go.dev/dl/go${go_version}.linux-amd64.tar.gz && \
     rm go${go_version}.linux-amd64.tar.gz
 ENV PATH="${PATH}:/usr/local/go/bin"
 #Install Java
-RUN curl -OL https://cdn.azul.com/zulu/bin/zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
-    tar -C /usr/local -xzf zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
-    rm zulu8.70.0.23-ca-jdk8.0.372-linux_x64.tar.gz && \
-    mv /usr/local/zulu8.70.0.23-ca-jdk8.0.372-linux_x64 /usr/local/java
+RUN curl -OL https://cdn.azul.com/zulu/bin/zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
+    tar -C /usr/local -xzf zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
+    rm zulu11.74.15-ca-jdk11.0.24-linux_x64.tar.gz && \
+    mv /usr/local/zulu11.74.15-ca-jdk11.0.24-linux_x64 /usr/local/java
 ENV PATH="${PATH}:/usr/local/java/bin"
 #Install Gradle
-RUN curl -OL https://services.gradle.org/distributions/gradle-7.3.3-bin.zip && \
-    unzip gradle-7.3.3-bin.zip && \
-    rm gradle-7.3.3-bin.zip && \
-    mv gradle-7.3.3 /usr/local/gradle
+RUN curl -OL https://services.gradle.org/distributions/gradle-8.4-bin.zip && \
+    unzip gradle-8.4-bin.zip && \
+    rm gradle-8.4-bin.zip && \
+    mv gradle-8.4 /usr/local/gradle
 ENV PATH="${PATH}:/usr/local/gradle/bin"
 #Install GitHub CLI
 RUN curl -OL https://github.com/cli/cli/releases/download/v2.31.0/gh_2.31.0_linux_amd64.tar.gz && \

.github/trigger_files/IO_Iceberg_Integration_Tests.json

@@ -1,4 +1,4 @@
 {
     "comment": "Modify this file in a trivial way to cause this test suite to run",
-    "modification": 2
+    "modification": 1
 }

.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Spark.json

@@ -1,4 +1,5 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test"
+  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test",
+  "https://github.com/apache/beam/pull/31798": "noting that PR #31798 should run this test"
 }

.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_SparkStructuredStreaming.json

@@ -1,4 +1,5 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test"
+  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test",
+  "https://github.com/apache/beam/pull/31798": "noting that PR #31798 should run this test"
 }

.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Spark_Java11.json

@@ -1,4 +1,5 @@
 {
   "comment": "Modify this file in a trivial way to cause this test suite to run",
-  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test"
+  "https://github.com/apache/beam/pull/31156": "noting that PR #31156 should run this test",
+  "https://github.com/apache/beam/pull/31798": "noting that PR #31798 should run this test"
 }

.github/trigger_files/beam_PostCommit_Python.json

@@ -1,4 +1,5 @@
 {
-  "comment": "Modify this file in a trivial way to cause this test suite to run."
+  "comment": "Modify this file in a trivial way to cause this test suite to run.",
+  "modification": 1
 }
 

.github/workflows/IO_Iceberg_Integration_Tests.yml

@@ -75,4 +75,4 @@ jobs:
       - name: Run IcebergIO Integration Test
         uses: ./.github/actions/gradle-command-self-hosted-action
         with:
-          gradle-command: :sdks:java:io:iceberg:integrationTest
+          gradle-command: :sdks:java:io:iceberg:catalogTests