From b7791b710d69a7c0fe624ec65a1c966cc53cbfaf Mon Sep 17 00:00:00 2001 From: shroffk Date: Fri, 9 Jan 2026 13:53:58 -0500 Subject: [PATCH 1/2] prepare for moving CI/CD to JDK 21 --- .github/workflows/build.yml | 2 +- .github/workflows/build_latest.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b1e890f3d..00ee599c99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -14,7 +14,7 @@ jobs: - name: Setup Maven and Java Action uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '17' + java-version: '21' maven-version: '3.9.6' - name: Build run: mvn --batch-mode install -DskipTests \ No newline at end of file diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml index 6d39ae0918..72bc62f3be 100644 --- a/.github/workflows/build_latest.yml +++ b/.github/workflows/build_latest.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Maven and Java Action uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '17' + java-version: '21' maven-version: '3.9.6' - name: Build run: mvn --batch-mode install -DskipTests From 2993b4e24dddf6f36e88d323c646f81bf061df64 Mon Sep 17 00:00:00 2001 From: shroffk Date: Mon, 23 Feb 2026 10:45:19 -0500 Subject: [PATCH 2/2] updated the docker images to JDK21 --- .github/workflows/alarm-logger-docker-image.yml | 6 +++--- .github/workflows/alarm-server-docker-image.yml | 6 +++--- .github/workflows/save-and-restore-docker-image.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/alarm-logger-docker-image.yml b/.github/workflows/alarm-logger-docker-image.yml index 5d5609bd66..94071123e6 100644 --- a/.github/workflows/alarm-logger-docker-image.yml +++ b/.github/workflows/alarm-logger-docker-image.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Maven and Java Action uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '17' + java-version: '21' maven-version: '3.9.6' - name: Build run: mvn --batch-mode install -DskipTests @@ -30,10 +30,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.github/workflows/alarm-server-docker-image.yml b/.github/workflows/alarm-server-docker-image.yml index 23d8f8e224..4fe2f28281 100644 --- a/.github/workflows/alarm-server-docker-image.yml +++ b/.github/workflows/alarm-server-docker-image.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Maven and Java Action uses: s4u/setup-maven-action@v1.18.0 with: - java-version: '17' + java-version: '21' maven-version: '3.9.6' - name: Build run: mvn --batch-mode install -DskipTests @@ -30,10 +30,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Maven diff --git a/.github/workflows/save-and-restore-docker-image.yml b/.github/workflows/save-and-restore-docker-image.yml index 22a9438925..56d2a3734e 100644 --- a/.github/workflows/save-and-restore-docker-image.yml +++ b/.github/workflows/save-and-restore-docker-image.yml @@ -19,10 +19,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven - name: Build with Maven