From 3c3c6307ea88dc56f5901a95c295d1b2d53a3559 Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:43:18 -0400
Subject: [PATCH] feat: update graal-sdk to 24 and graalvm-A to 21.x (#815)

* feat: update graal-sdk to 24 and graalvm-A to 22.x
---
 .cloudbuild/graalvm-a.Dockerfile      | 6 +++---
 .cloudbuild/graalvm-a.yaml            | 2 +-
 .kokoro/presubmit/downstream-build.sh | 3 +--
 native-image-shared-config/pom.xml    | 3 ++-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cloudbuild/graalvm-a.Dockerfile b/.cloudbuild/graalvm-a.Dockerfile
index af96946f..4a22a055 100644
--- a/.cloudbuild/graalvm-a.Dockerfile
+++ b/.cloudbuild/graalvm-a.Dockerfile
@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ghcr.io/graalvm/graalvm-community:17.0.9-ol7
-RUN gu install native-image && \
-    yum update -y && \
+FROM ghcr.io/graalvm/graalvm-community:21.0.2-ol7-20240116
+
+RUN yum update -y && \
     yum install -y wget unzip git && \
     # Install maven
     wget -q https://archive.apache.org/dist/maven/maven-3/3.9.4/binaries/apache-maven-3.9.4-bin.zip -O /tmp/maven.zip && \
diff --git a/.cloudbuild/graalvm-a.yaml b/.cloudbuild/graalvm-a.yaml
index 06db3dcf..50f8dc14 100644
--- a/.cloudbuild/graalvm-a.yaml
+++ b/.cloudbuild/graalvm-a.yaml
@@ -17,7 +17,7 @@ commandTests:
   - name: "version"
     command: ["java", "-version"]
     # java -version outputs to stderr...
-    expectedError: ["openjdk version \"17.0.9\"", "GraalVM CE 17.0.9"]
+    expectedError: ["openjdk version \"21.0.2\"", "GraalVM CE 21.0.2"]
   - name: "maven"
     command: ["mvn", "-version"]
     expectedOutput: ["Apache Maven 3.9.4"]
diff --git a/.kokoro/presubmit/downstream-build.sh b/.kokoro/presubmit/downstream-build.sh
index 710bfd4e..3ca932fc 100755
--- a/.kokoro/presubmit/downstream-build.sh
+++ b/.kokoro/presubmit/downstream-build.sh
@@ -16,7 +16,6 @@
 set -eo pipefail
 set -x
 
-
 function modify_shared_config() {
   xmllint --shell pom.xml <<EOF
   setns x=http://maven.apache.org/POM/4.0.0
@@ -54,7 +53,7 @@ pushd sdk-platform-java/showcase/gapic-showcase
 SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)
 popd
 
-## Start showcase server
+# Start showcase server
 mkdir -p /usr/src/showcase
 curl --location https://github.com/googleapis/gapic-showcase/releases/download/v"${SHOWCASE_VERSION}"/gapic-showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz --output /usr/src/showcase/showcase-"${SHOWCASE_VERSION}"-linux-amd64.tar.gz
 pushd /usr/src/showcase/
diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml
index 5ec1217c..273a0166 100644
--- a/native-image-shared-config/pom.xml
+++ b/native-image-shared-config/pom.xml
@@ -58,12 +58,13 @@
   </licenses>
 
   <properties>
+    <graal-sdk.version>24.0.2</graal-sdk.version>
     <surefire.version>3.3.1</surefire.version>
-    <graal-sdk.version>22.3.5</graal-sdk.version>
     <graal-sdk-nativeimage.version>24.0.2</graal-sdk-nativeimage.version>
     <native-maven-plugin.version>0.10.2</native-maven-plugin.version>
     <junit-vintage-engine.version>5.10.3</junit-vintage-engine.version>
     <opentest4j.version>1.3.0</opentest4j.version>
+    <ignoredDependencies>org.graalvm.sdk:nativeimage</ignoredDependencies>
   </properties>
 
   <dependencyManagement>