fix: set java version used in the gradle test to 21. Change the image…

… used in skaffold.yaml so that the ccompiled java application runs in java V21 environment instead of V11.
GoogleContainerTools · Dec 23, 2024 · ec6f069 · ec6f069
1 parent f9c0386
commit ec6f069
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/examples/jib-sync/build.gradle b/examples/jib-sync/build.gradle
@@ -9,8 +9,8 @@ repositories {
   mavenCentral()
 }
 
-sourceCompatibility = 17
-targetCompatibility = 17
+sourceCompatibility = 21
+targetCompatibility = 21
 
 dependencies {
   implementation "org.springframework.boot:spring-boot-starter-web"
@@ -22,4 +22,4 @@ dependencies {
   testImplementation "org.springframework.boot:spring-boot-starter-test"
 }
 
-jib.from.image = 'openjdk:17'
+jib.from.image = 'openjdk:21'
diff --git a/examples/jib-sync/skaffold-gradle.yaml b/examples/jib-sync/skaffold-gradle.yaml
@@ -7,7 +7,7 @@ build:
       type: gradle
       args: 
       - -Psync
-      fromImage: gcr.io/distroless/java:debug
+      fromImage: gcr.io/distroless/java21-debian12:debug
     sync:
       auto: true
 

diff --git a/integration/examples/jib-sync/build.gradle b/integration/examples/jib-sync/build.gradle
@@ -6,20 +6,20 @@ plugins {
 }
 
 repositories {
-  mavenCentral()
+    mavenCentral()
 }
 
-sourceCompatibility = 17
-targetCompatibility = 17
+sourceCompatibility = 21
+targetCompatibility = 21
 
 dependencies {
-  implementation "org.springframework.boot:spring-boot-starter-web"
-  implementation "org.springframework.boot:spring-boot-starter-actuator"
-  if (project.hasProperty('sync')) {
-    implementation "org.springframework.boot:spring-boot-devtools"
-  }
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    implementation "org.springframework.boot:spring-boot-starter-actuator"
+    if (project.hasProperty('sync')) {
+        implementation "org.springframework.boot:spring-boot-devtools"
+    }
 
-  testImplementation "org.springframework.boot:spring-boot-starter-test"
+    testImplementation "org.springframework.boot:spring-boot-starter-test"
 }
 
-jib.from.image = 'openjdk:17'
+jib.from.image = 'openjdk:21'
diff --git a/integration/examples/jib-sync/skaffold-gradle.yaml b/integration/examples/jib-sync/skaffold-gradle.yaml
@@ -7,7 +7,7 @@ build:
       type: gradle
       args: 
       - -Psync
-      fromImage: gcr.io/distroless/java:debug
+      fromImage: gcr.io/distroless/java21-debian12:debug
     sync:
       auto: true