From acf065a90ac6443d129b7e748e1a9ab5b2d2f072 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Richard=20Op=C3=A1lka?= <opalka.richard@gmail.com>
Date: Mon, 9 Oct 2023 15:39:14 +0200
Subject: [PATCH] [UNDERTOW-2318] Adding support for JDK19 in Jastow compiler

---
 pom.xml                                                   | 2 +-
 src/main/java/org/apache/jasper/compiler/JDTCompiler.java | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b7678dc..8f59129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <version.jakarta.servlet.jsp.jakarta-servlet-jsp-api>3.1.0</version.jakarta.servlet.jsp.jakarta-servlet-jsp-api>
         <version.junit>4.13.2</version.junit>
         <version.org.apache.httpcomponents>4.5.13</version.org.apache.httpcomponents>
-        <version.org.eclipse.jdt.ecj>3.31.0</version.org.eclipse.jdt.ecj>
+        <version.org.eclipse.jdt.ecj>3.32.0</version.org.eclipse.jdt.ecj>
         <version.org.glassfish.expressly>5.0.0</version.org.glassfish.expressly>
         <version.org.jboss.logging.jboss-logging>3.5.0.Final</version.org.jboss.logging.jboss-logging>
         <version.org.jboss.logging.jboss-logging-tools>2.2.1.Final</version.org.jboss.logging.jboss-logging-tools>
diff --git a/src/main/java/org/apache/jasper/compiler/JDTCompiler.java b/src/main/java/org/apache/jasper/compiler/JDTCompiler.java
index 94b8d55..b5a7cae 100644
--- a/src/main/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/src/main/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -330,6 +330,8 @@ public void cleanup() {
                  settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_17);
             } else if (opt.equals("18")) {
                  settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_18);
+            } else if (opt.equals("19")) {
+                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_19);
             } else {
                 JasperLogger.COMPILER_LOGGER.unknownSourceJvm(opt);
                 settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_11);
@@ -392,6 +394,9 @@ public void cleanup() {
             } else if (opt.equals("18")) {
                  settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_18);
                  settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_18);
+            } else if (opt.equals("19")) {
+                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_19);
+                 settings.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_19);
             } else {
                 JasperLogger.COMPILER_LOGGER.unknownTargetJvm(opt);
                 settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_11);