From e604a345ed64496fb9658dfbaebb75bb212a9869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <csviri@gmail.com>
Date: Thu, 7 Mar 2024 11:52:12 +0100
Subject: [PATCH 1/2] feat: use java 17 as baseline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Attila Mészáros <csviri@gmail.com>
---
 bootstrapper-maven-plugin/src/main/resources/templates/pom.xml | 2 +-
 pom.xml                                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml b/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
index d2ffb66b46..007525a38b 100644
--- a/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
+++ b/bootstrapper-maven-plugin/src/main/resources/templates/pom.xml
@@ -11,7 +11,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <josdk.version>{{josdkVersion}}</josdk.version>
diff --git a/pom.xml b/pom.xml
index 75f7c6dc28..b298fc1143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>11</java.version>
+        <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <sonar.organization>java-operator-sdk</sonar.organization>

From 3801e480d022a8d9a22ba111f00638f747ff4747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <csviri@gmail.com>
Date: Fri, 8 Mar 2024 10:33:19 +0100
Subject: [PATCH 2/2] fix java 17 images
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Attila Mészáros <csviri@gmail.com>
---
 sample-operators/leader-election/pom.xml | 2 +-
 sample-operators/mysql-schema/pom.xml    | 2 +-
 sample-operators/tomcat-operator/pom.xml | 2 +-
 sample-operators/webpage/pom.xml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sample-operators/leader-election/pom.xml b/sample-operators/leader-election/pom.xml
index f9941b36f8..da03e443c1 100644
--- a/sample-operators/leader-election/pom.xml
+++ b/sample-operators/leader-election/pom.xml
@@ -71,7 +71,7 @@
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
                     <from>
-                        <image>gcr.io/distroless/java:11</image>
+                        <image>gcr.io/distroless/java17-debian11</image>
                     </from>
                     <to>
                         <image>leader-election-operator</image>
diff --git a/sample-operators/mysql-schema/pom.xml b/sample-operators/mysql-schema/pom.xml
index 0d19f20d19..abbc564de2 100644
--- a/sample-operators/mysql-schema/pom.xml
+++ b/sample-operators/mysql-schema/pom.xml
@@ -98,7 +98,7 @@
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
                     <from>
-                        <image>gcr.io/distroless/java:11</image>
+                        <image>gcr.io/distroless/java17-debian11</image>
                     </from>
                     <to>
                         <image>mysql-schema-operator</image>
diff --git a/sample-operators/tomcat-operator/pom.xml b/sample-operators/tomcat-operator/pom.xml
index f166c565e1..3465a6677a 100644
--- a/sample-operators/tomcat-operator/pom.xml
+++ b/sample-operators/tomcat-operator/pom.xml
@@ -100,7 +100,7 @@
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
                     <from>
-                        <image>gcr.io/distroless/java:11</image>
+                        <image>gcr.io/distroless/java17-debian11</image>
                     </from>
                     <to>
                         <image>tomcat-operator</image>
diff --git a/sample-operators/webpage/pom.xml b/sample-operators/webpage/pom.xml
index fc0a839804..35ac7ea252 100644
--- a/sample-operators/webpage/pom.xml
+++ b/sample-operators/webpage/pom.xml
@@ -71,7 +71,7 @@
                 <version>${jib-maven-plugin.version}</version>
                 <configuration>
                     <from>
-                        <image>gcr.io/distroless/java:11</image>
+                        <image>gcr.io/distroless/java17-debian11</image>
                     </from>
                     <to>
                         <image>webpage-operator</image>