From 6b6216c55e1d56cf0c8217f5460b574f2f52d732 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 15:27:07 +0000 Subject: [PATCH 1/2] Upgrade from Java 17 to Java 22 Phase 1: Update Maven Configuration - Update java.version property from 17 to 22 - Fix maven-compiler-plugin source/target from 1.8 to 22 - Upgrade Spring Boot parent from 3.3.3 to 3.4.0 Phase 2: Update Docker Configuration - Update builder stage from maven:3.8.3-openjdk-17 to maven:3.8.3-openjdk-22 - Update runtime stage from openjdk:17-alpine to openjdk:22-alpine Phase 3: Update Jenkins CI/CD Configuration - Update README.md Jenkins installation from openjdk-17-jre to openjdk-22-jre Phase 4: Update Kubernetes Deployment - Update container image tag to java22 for the rebuilt image Phase 5: Update Documentation - Update README-K8S.md Jenkins installation from openjdk-17-jre to openjdk-22-jre Co-Authored-By: Satwik Bebortha --- Dockerfile | 4 ++-- README-K8S.md | 2 +- README.md | 2 +- kubernetes/bankapp-deployment.yml | 2 +- pom.xml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 079acabe..b9c2c552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ #---------------------------------- # Import docker image with maven installed -FROM maven:3.8.3-openjdk-17 as builder +FROM maven:3.8.3-openjdk-22 as builder # Add maintainer, so that new user will understand who had written this Dockerfile MAINTAINER Madhup Pandey @@ -25,7 +25,7 @@ RUN mvn clean install -DskipTests=true #-------------------------------------- # Import small size java image -FROM openjdk:17-alpine as deployer +FROM openjdk:22-alpine as deployer # Copy build from stage 1 (builder) COPY --from=builder /src/target/*.jar /src/target/bankapp.jar diff --git a/README-K8S.md b/README-K8S.md index 7554262f..a0750f0c 100644 --- a/README-K8S.md +++ b/README-K8S.md @@ -85,7 +85,7 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-17-jre -y +sudo apt install fontconfig openjdk-22-jre -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key diff --git a/README.md b/README.md index 2f49958e..aac1e425 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-17-jre -y +sudo apt install fontconfig openjdk-22-jre -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key diff --git a/kubernetes/bankapp-deployment.yml b/kubernetes/bankapp-deployment.yml index 45a35b6f..3343e855 100644 --- a/kubernetes/bankapp-deployment.yml +++ b/kubernetes/bankapp-deployment.yml @@ -17,7 +17,7 @@ spec: spec: containers: - name: bankapp - image: trainwithshubham/bankapp-eks:v2 + image: trainwithshubham/bankapp-eks:java22 ports: - containerPort: 8080 env: diff --git a/pom.xml b/pom.xml index fc5bfeac..e69676d0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.0 com.example @@ -27,7 +27,7 @@ - 17 + 22 @@ -80,8 +80,8 @@ maven-compiler-plugin 3.8.0 - 1.8 - 1.8 + 22 + 22 From 614b4444cf94c8a6b274146e14c9ecac2ddb744e Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 13 Jan 2026 00:29:07 +0000 Subject: [PATCH 2/2] Fix Docker images and Java 22 installation instructions - Update Dockerfile to use existing Docker images: - Builder: maven:3.9-eclipse-temurin-22 (maven:3.8.3-openjdk-22 does not exist) - Runtime: eclipse-temurin:22-jre-alpine (openjdk:22-alpine does not exist) - Update README.md and README-K8S.md Jenkins installation: - openjdk-22-jre is not available in Ubuntu apt repositories - Added Eclipse Temurin (Adoptium) repository installation for Java 22 - Install temurin-22-jdk instead of openjdk-22-jre Co-Authored-By: Satwik Bebortha --- Dockerfile | 4 ++-- README-K8S.md | 9 ++++++++- README.md | 9 ++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9c2c552..f5c70a33 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ #---------------------------------- # Import docker image with maven installed -FROM maven:3.8.3-openjdk-22 as builder +FROM maven:3.9-eclipse-temurin-22 as builder # Add maintainer, so that new user will understand who had written this Dockerfile MAINTAINER Madhup Pandey @@ -25,7 +25,7 @@ RUN mvn clean install -DskipTests=true #-------------------------------------- # Import small size java image -FROM openjdk:22-alpine as deployer +FROM eclipse-temurin:22-jre-alpine as deployer # Copy build from stage 1 (builder) COPY --from=builder /src/target/*.jar /src/target/bankapp.jar diff --git a/README-K8S.md b/README-K8S.md index a0750f0c..59d92d88 100644 --- a/README-K8S.md +++ b/README-K8S.md @@ -85,7 +85,14 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-22-jre -y +sudo apt install fontconfig -y + +# Install Eclipse Temurin JDK 22 (openjdk-22 is not available in Ubuntu apt repositories) +sudo apt install -y wget apt-transport-https gpg +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo gpg --dearmor -o /usr/share/keyrings/adoptium.gpg +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/adoptium.list +sudo apt update -y +sudo apt install temurin-22-jdk -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key diff --git a/README.md b/README.md index aac1e425..01297177 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,14 @@ sudo su - Install Jenkins ```bash sudo apt update -y -sudo apt install fontconfig openjdk-22-jre -y +sudo apt install fontconfig -y + +# Install Eclipse Temurin JDK 22 (openjdk-22 is not available in Ubuntu apt repositories) +sudo apt install -y wget apt-transport-https gpg +wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | sudo gpg --dearmor -o /usr/share/keyrings/adoptium.gpg +echo "deb [signed-by=/usr/share/keyrings/adoptium.gpg] https://packages.adoptium.net/artifactory/deb $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/adoptium.list +sudo apt update -y +sudo apt install temurin-22-jdk -y sudo wget -O /usr/share/keyrings/jenkins-keyring.asc \ https://pkg.jenkins.io/debian-stable/jenkins.io-2023.key