diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
index 241baaa7d..dd387e492 100644
--- a/.github/workflows/master-build.yml
+++ b/.github/workflows/master-build.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, ubuntu-20.04, windows-latest, macos-latest ]
-        java: [ '22' ]
+        java: [ '23' ]
     steps:
       - uses: actions/checkout@v4
 
diff --git a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java
index 288010ba6..fb66cf217 100644
--- a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java
+++ b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java
@@ -25,15 +25,16 @@
  * limitations under the License.
  */
 
-/**
+/*
  * Based on http://antony.lesuisse.org/software/ajaxterm/
  *  Public Domain License
  */
 
-/**
+/*
  * See http://www.ecma-international.org/publications/standards/Ecma-048.htm
  *       and http://vt100.net/docs/vt510-rm/
  */
+
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java b/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java
index a557f2c1b..d14807a67 100644
--- a/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java
+++ b/demo/src/main/java/org/apache/felix/gogo/jline/Posix.java
@@ -1865,6 +1865,7 @@ public static class SortComparator implements Comparator<String> {
         private char separator;
         private List<Key> sortKeys;
 
+        @SuppressWarnings("this-escape")
         public SortComparator(
                 boolean caseInsensitive,
                 boolean reverse,
diff --git a/groovy/pom.xml b/groovy/pom.xml
index 521d13a35..89bfafaac 100644
--- a/groovy/pom.xml
+++ b/groovy/pom.xml
@@ -70,6 +70,9 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
+                <configuration>
+                    <targetBytecode>${java.release.version}</targetBytecode>
+                </configuration>
                 <executions>
                     <execution>
                         <goals>
diff --git a/jansi-core/src/main/java/org/jline/jansi/Ansi.java b/jansi-core/src/main/java/org/jline/jansi/Ansi.java
index 28d92226a..29d8bc982 100644
--- a/jansi-core/src/main/java/org/jline/jansi/Ansi.java
+++ b/jansi-core/src/main/java/org/jline/jansi/Ansi.java
@@ -900,9 +900,9 @@ public String toString() {
         return builder.toString();
     }
 
-    ///////////////////////////////////////////////////////////////////
+    // =================================================================
     // Private Helper Methods
-    ///////////////////////////////////////////////////////////////////
+    // =================================================================
 
     private Ansi appendEscapeSequence(char command) {
         flushAttributes();
diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java
index ba4dcbf2d..7a66ecf44 100644
--- a/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java
+++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/Connection.java
@@ -189,7 +189,7 @@ public boolean isActive() {
         return !dead;
     } // isClosed
 
-    /****** Event handling ****************/
+    // ============= Event handling =============
 
     /**
      * Method that registers a ConnectionListener with the
diff --git a/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java b/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java
index f280a65b3..f75b6502d 100644
--- a/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java
+++ b/remote-telnet/src/main/java/org/jline/builtins/telnet/TelnetIO.java
@@ -139,7 +139,7 @@ public class TelnetIO {
      */
     protected static final int AO = 245;
 
-    /**** Implementation of OutputStream ****************************************************/
+    // ============= Implementation of OutputStream ===============
     /**
      * Are You There
      */
@@ -187,9 +187,9 @@ public class TelnetIO {
      */
     protected static final int SEND = 1;
 
-    /**** End implementation of OutputStream ***********************************************/
+    // ============ End implementation of OutputStream ============
 
-    /**** Implementation of InputStream ****************************************************/
+    // ============== Implementation of InputStream ===============
     /**
      * Telnet Option: Logout<br>
      * This allows nice goodbye to time-outed or unwanted clients.
@@ -206,7 +206,7 @@ public class TelnetIO {
     protected static final int LM_EDIT = 1;
     protected static final int LM_TRAPSIG = 2;
 
-    /**** Implementation of InputStream ****************************************************/
+    // ============== Implementation of InputStream ===============
 
     /****
      * Following methods implement init/request/answer procedures for telnet
@@ -219,12 +219,13 @@ public class TelnetIO {
     protected static final int LM_SLC_NOSUPPORT = 0;
     protected static final int LM_SLC_DEFAULT = 3;
 
-    /**** End telnet protocol level communication methods *******************************/
+    // ==== End telnet protocol level communication methods ===
+
     protected static final int LM_SLC_VALUE = 2;
 
-    /** Constants declaration ***********************************************/
+    // ============= Constants declaration ====================
 
-    // Telnet Protocoll Constants
+    // Telnet Protocol Constants
     protected static final int LM_SLC_CANTCHANGE = 1;
 
     protected static final int LM_SLC_LEVELBITS = 3;
diff --git a/terminal/src/main/java/org/jline/utils/InputStreamReader.java b/terminal/src/main/java/org/jline/utils/InputStreamReader.java
index 141bb17e8..083a3f8c8 100644
--- a/terminal/src/main/java/org/jline/utils/InputStreamReader.java
+++ b/terminal/src/main/java/org/jline/utils/InputStreamReader.java
@@ -22,8 +22,7 @@
 import java.nio.charset.MalformedInputException;
 import java.nio.charset.UnmappableCharacterException;
 
-/**
- *
+/*
  * NOTE for JLine: the default InputStreamReader that comes from the JRE
  * usually read more bytes than needed from the input stream, which
  * is not usable in a character per character model used in the terminal.