From e84e2800a46b3de98d59777383e6b634cb896af5 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Thu, 24 Feb 2022 10:55:20 +0100
Subject: [PATCH] Add Java 17 to GHA CI build matrix (#12360)

This adds Java 17 to the GitHub Actions CI build matrix so we can make sure the build keeps working with both Java 11 and Java 17.
It also updates the required Java version range used by the enforcer plugin so it is also possible to build with the supported Java versions.

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .github/workflows/ci-build.yml | 2 +-
 pom.xml                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 24c0cc756f0..17f0dc0d886 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -17,7 +17,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ '11' ]
+        java: [ '11', '17' ]
         maven: [ '3.8.4']
         os: [ 'ubuntu-20.04' ]
     name: Build (Java ${{ matrix.java }}, ${{ matrix.os }})
diff --git a/pom.xml b/pom.xml
index 299cf0cd22b..129126d5bdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -680,7 +680,7 @@ Import-Package: \\
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[11.0,12.0)</version>
+                  <version>[11.0,18.0)</version>
                 </requireJavaVersion>
               </rules>
             </configuration>