From e079157a3c74eaec8104d82dccd41308bcbb2f09 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 12:36:36 +0200
Subject: [PATCH 1/6] JRuby extension: use --release

This change avoids using --source 1.8 and --target 1.8, to side-step a warning.

    warning: [options] bootstrap class path not set in conjunction with -source 8
---
 Rakefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Rakefile b/Rakefile
index 9262a89..9407f5b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -3,8 +3,7 @@ require "rake/testtask"
 
 require 'rake/javaextensiontask'
 Rake::JavaExtensionTask.new("escape") do |ext|
-  ext.source_version = '1.8'
-  ext.target_version = '1.8'
+  ext.release = '8'
   ext.ext_dir = 'ext/java'
   ext.lib_dir = 'lib/cgi'
 

From 8db4d3677bcb580bca5daf36868c087eab2cba75 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 13:01:21 +0200
Subject: [PATCH 2/6] CI: For Java-related builds, use a new Java

---
 .github/workflows/test.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index df8824a..e0ec6fe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,6 +30,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
+    - name: remove default java except 21
+      if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
+      run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
+    - name: set up java 21
+      if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 21
+        cache: 'maven'
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

From 9c3fe26b01c830a3ff64c99546e72a49a0a78aa3 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 13:03:41 +0200
Subject: [PATCH 3/6] CI: Try dropping the cache maven detail

---
 .github/workflows/test.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e0ec6fe..c517a12 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,7 +39,6 @@ jobs:
       with:
         distribution: 'temurin'
         java-version: 21
-        cache: 'maven'
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

From 5a0a234f36f1bda5876874a575af97d8ccaacafb Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 13:14:42 +0200
Subject: [PATCH 4/6] CI: Try flipping the order of uninstall/install

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c517a12..7e74797 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -30,15 +30,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
-    - name: remove default java except 21
-      if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
-      run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
     - name: set up java 21
       if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: 21
+    - name: remove default java except 21
+      if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
+      run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

From 45a2ec83de166fe5a88a336ceb771b59ef852efe Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 13:17:02 +0200
Subject: [PATCH 5/6] CI: try NOT dropping Javas for trufflruby

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7e74797..808f0fe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
         distribution: 'temurin'
         java-version: 21
     - name: remove default java except 21
-      if: ${{ matrix.ruby == 'jruby-head' || matrix.ruby == 'truffleruby' || matrix.ruby == 'truffleruby-head' }}
+      if: ${{ matrix.ruby == 'jruby-head' }}
       run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

From 6bf69cb23b6f6eb76f2aa95e26a729ce621da783 Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@auctionet.com>
Date: Mon, 7 Apr 2025 13:24:08 +0200
Subject: [PATCH 6/6] CI: Add JRUBY_OPTS=--debug

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

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 808f0fe..491c722 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,6 +9,8 @@ jobs:
       min_version: 2.5
   test:
     needs: ruby-versions
+    env:
+      JRUBY_OPTS: '--debug'
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       fail-fast: false