From 8d76c1ff5a119a10ddcb8cf4b76df1c4c589479e Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Sun, 7 May 2023 16:53:16 +0200
Subject: [PATCH 1/4] Raise minimum Java version to 11

---
 .github/workflows/ci.yml |  6 +-----
 build.gradle             | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 04d1778..bc64064 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,15 +12,11 @@ jobs:
   test:
     strategy:
       matrix:
-        java: ['8', '11', '17']
+        java: ['11', '17']
         os: [ubuntu-latest, macos-latest, windows-latest]
         exclude:
-          - os: macos-latest
-            java: '8'
           - os: macos-latest
             java: '17'
-          - os: windows-latest
-            java: '8'
           - os: windows-latest
             java: '17'
     runs-on: ${{ matrix.os }}
diff --git a/build.gradle b/build.gradle
index b9a16a0..1dab85d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,7 +34,7 @@ ext {
   jrubyVersion = '9.2.4.0'
   junitVersion = '5.8.2'
   assertjVersion = '3.22.0'
-  jsoupVersion = '1.14.3'
+  jsoupVersion = '1.15.3'
 
   // gem versions
   asciidoctorJVersion = project.hasProperty('asciidoctorJVersion') ? project.asciidoctorJVersion : '2.5.3'
@@ -56,17 +56,17 @@ subprojects {
 
   // NOTE sourceCompatibility & targetCompatibility are set in gradle.properties to meet requirements of Gradle
   // Must redefine here to work around a bug in the Eclipse plugin
-  sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
+  sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
 
-  plugins.withType(JavaPlugin) {
-    project.tasks.withType(JavaCompile) { task ->
-      if (JavaVersion.current().isJava11Compatible()) {
-        task.options.release = 8
-      }
+  plugins.withType(JavaPlugin).configureEach {
+    project.tasks.withType(JavaCompile).configureEach { task ->
+      task.options.release = 11
     }
-    project.tasks.withType(GroovyCompile) { task ->
-      if (JavaVersion.current().isJava11Compatible()) {
-        task.options.release = 8
+    project.tasks.withType(GroovyCompile).tap {
+      configureEach { task ->
+        if (JavaVersion.current().isJava11Compatible()) {
+          task.options.release = 11
+        }
       }
     }
   }

From 67476f2e3323e5262275fd657f64cc0331f83833 Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Sun, 7 May 2023 21:06:10 +0200
Subject: [PATCH 2/4] Remove duplicate java version configuration

---
 build.gradle | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1dab85d..056c722 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,19 +58,6 @@ subprojects {
   // Must redefine here to work around a bug in the Eclipse plugin
   sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
 
-  plugins.withType(JavaPlugin).configureEach {
-    project.tasks.withType(JavaCompile).configureEach { task ->
-      task.options.release = 11
-    }
-    project.tasks.withType(GroovyCompile).tap {
-      configureEach { task ->
-        if (JavaVersion.current().isJava11Compatible()) {
-          task.options.release = 11
-        }
-      }
-    }
-  }
-
   repositories {
     if (project.hasProperty('useMavenLocal') && project.useMavenLocal.toBoolean()) {
       mavenLocal()

From 08186b8e633be7f129f6ba6a386f3bade6023992 Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Mon, 8 May 2023 08:31:17 +0200
Subject: [PATCH 3/4] Set Java release version again

---
 build.gradle | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 056c722..b88f1fa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,9 +54,12 @@ subprojects {
 
   status = _status
 
-  // NOTE sourceCompatibility & targetCompatibility are set in gradle.properties to meet requirements of Gradle
-  // Must redefine here to work around a bug in the Eclipse plugin
-  sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
+  project.tasks.withType(JavaCompile).configureEach { task ->
+    task.options.release = 11
+  }
+  project.tasks.withType(GroovyCompile).configureEach {task ->
+    task.options.release = 11
+  }
 
   repositories {
     if (project.hasProperty('useMavenLocal') && project.useMavenLocal.toBoolean()) {

From f7050fe45a3823bcc6de9d61b9cc44629fda225e Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer.pb@googlemail.com>
Date: Mon, 8 May 2023 09:34:43 +0200
Subject: [PATCH 4/4] Upgrade Github action versions

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc64064..1211f44 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,8 @@ jobs:
             java: '17'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}