From 9544767641117aebe191f9b8b56364c189faabb6 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <mail@holger-friedrich.de>
Date: Mon, 16 Dec 2024 08:38:39 +0100
Subject: [PATCH] Remove Java 17 build, switch to 21 (#17910)

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
---
 .github/workflows/ci-build.yml | 31 +++++--------------------------
 pom.xml                        |  8 ++++----
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index d95c2d22de2f3..20e90056037e7 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [ '17', '21', 'profile-j21' ]
+        java: [ '21' ]
         maven: [ '3.9.9' ]
         os: [ 'ubuntu-24.04' ]
     name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
@@ -46,25 +46,17 @@ jobs:
 
       - name: Set up Java ${{ matrix.java }}
         uses: actions/setup-java@v4
-        if: ${{ matrix.java != 'profile-j21' }}
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - name: Set up Java ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        if: ${{ matrix.java == 'profile-j21' }}
-        with:
-          distribution: 'temurin'
-          java-version: ${{ 21 }}
-
       - name: Set up Maven ${{ matrix.maven }}
         uses: stCarolas/setup-maven@v5
         with:
           maven-version: ${{ matrix.maven }}
 
       - name: Register Problem Matchers
-        if: ${{ matrix.java == '17' }}
+        if: ${{ matrix.java == '21' }}
         id: problem_matchers
         run: |
           echo "::add-matcher::.github/openhab-compile-problems.json"
@@ -77,7 +69,6 @@ jobs:
           format: 'csv'
 
       - name: Build
-        if: ${{ matrix.java != 'profile-j21' }}
         id: build
         run: './.github/scripts/maven-build'
         env:
@@ -88,34 +79,22 @@ jobs:
             -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
             -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
 
-      - name: Build
-        if: ${{ matrix.java == 'profile-j21' }}
-        id: build-j21
-        run: './.github/scripts/maven-build clean verify -B -T 1.5C -U -Pj21'
-        env:
-          CHANGED_FILES: ${{ steps.files.outputs.all }}
-          MAVEN_OPTS: >-
-            -Xmx2g
-            -Dmaven.wagon.http.retryHandler.count=5
-            -Dmaven.wagon.httpconnectionManager.ttlSeconds=25
-            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-
       - name: Upload Build Log
-        if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure') || (steps.build-j21.outcome == 'success') || (steps.build-j21.outcome == 'failure')) }}
+        if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: actions/upload-artifact@v4
         with:
           name: build-log-java-${{ matrix.java }}-${{ matrix.os }}
           path: build.log
 
       - name: Upload SAT Summary Report
-        if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
+        if: ${{ always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: actions/upload-artifact@v4
         with:
           name: sat-summary-report
           path: target/summary_report.html
 
       - name: Report SAT Errors as Annotations
-        if: ${{ matrix.java == '17' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
+        if: ${{ matrix.java == '21' && always() && ((steps.build.outcome == 'success') || (steps.build.outcome == 'failure')) }}
         uses: ghys/checkstyle-github-action@main
         with:
           title: CheckStyle Violations
diff --git a/pom.xml b/pom.xml
index 1ba331406652c..5780b574aaf2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <oh.java.version>17</oh.java.version>
+    <oh.java.version>21</oh.java.version>
     <maven.compiler.release>${oh.java.version}</maven.compiler.release>
 
     <ohc.version>5.0.0-SNAPSHOT</ohc.version>
@@ -639,7 +639,7 @@ Import-Package: \\
                   <version>3.6.3</version>
                 </requireMavenVersion>
                 <requireJavaVersion>
-                  <version>[17.0,18.0),[21.0,22.0)</version>
+                  <version>[21.0,22.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>
@@ -825,9 +825,9 @@ Import-Package: \\
       </build>
     </profile>
     <profile>
-      <id>j21</id>
+      <id>j17</id>
       <properties>
-        <oh.java.version>21</oh.java.version>
+        <oh.java.version>17</oh.java.version>
         <maven.compiler.release>${oh.java.version}</maven.compiler.release>
       </properties>
     </profile>