From ca153920b661e8a1056fc6168fcc4353b4cf95e8 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Thu, 7 Dec 2023 16:42:13 -0500
Subject: [PATCH 1/6] Update ECJ to 3.3.36.0 (4.30)

---
 dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml | 2 +-
 dev/cnf/oss_dependencies.maven                         | 2 +-
 dev/io.openliberty.org.eclipse.jdt.core.java17/bnd.bnd | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
index 5989419df453..4df031705e85 100644
--- a/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
+++ b/dev/cnf/dependabot/check_this_in_if_it_changes/pom.xml
@@ -2444,7 +2444,7 @@
     <dependency>
       <groupId>org.eclipse.jdt</groupId>
       <artifactId>ecj</artifactId>
-      <version>3.35.0</version>
+      <version>3.36.0</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/dev/cnf/oss_dependencies.maven b/dev/cnf/oss_dependencies.maven
index e8b2de8d54aa..32dc0500305a 100644
--- a/dev/cnf/oss_dependencies.maven
+++ b/dev/cnf/oss_dependencies.maven
@@ -484,7 +484,7 @@ org.eclipse.birt.runtime.3_7_1:org.apache.xml.serializer:2.7.1
 org.eclipse.birt.runtime:org.w3c.css.sac:1.3.1.v200903091627
 org.eclipse.jdt:ecj:3.26.0
 org.eclipse.jdt:ecj:3.33.0
-org.eclipse.jdt:ecj:3.35.0
+org.eclipse.jdt:ecj:3.36.0
 org.eclipse.jetty.websocket:javax-websocket-client-impl:9.2.2.v20140723
 org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.39.v20210325
 org.eclipse.jetty.websocket:websocket-api:9.2.2.v20140723
diff --git a/dev/io.openliberty.org.eclipse.jdt.core.java17/bnd.bnd b/dev/io.openliberty.org.eclipse.jdt.core.java17/bnd.bnd
index 837527ddeafa..b41e75fee85e 100644
--- a/dev/io.openliberty.org.eclipse.jdt.core.java17/bnd.bnd
+++ b/dev/io.openliberty.org.eclipse.jdt.core.java17/bnd.bnd
@@ -10,11 +10,11 @@
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
 
-# 3.35 (aka 4.29) added Java 21 support 
+# 3.36 (aka 4.30) added Java 21 support 
 
 Bundle-Name: JDT Compiler
 Bundle-SymbolicName: io.openliberty.org.eclipse.jdt.core.java17
-Bundle-Description: Eclipse Java Compiler (ECJ) from the Java Development Tools (JDT) Project. Version 3.35.0: Sept, 2023
+Bundle-Description: Eclipse Java Compiler (ECJ) from the Java Development Tools (JDT) Project. Version 3.36.0: Dec, 2023
 
 javac.source: 17
 javac.target: 17
@@ -23,6 +23,6 @@ Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=17))"
 
 Import-Package: !*
    
-Export-Package: org.eclipse.jdt.*;version=3.35.0;usage=JSP
+Export-Package: org.eclipse.jdt.*;version=3.36.0;usage=JSP
 
--buildpath: org.eclipse.jdt:ecj;strategy=exact;version=3.35.0
+-buildpath: org.eclipse.jdt:ecj;strategy=exact;version=3.36.0

From 84adb831e1ca621e2ee7ff5c40ceedc3c9b80f73 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Wed, 13 Dec 2023 11:33:52 -0500
Subject: [PATCH 2/6] Create javaSourceLevel jspOption

---
 .../OSGI-INF/l10n/metatype.properties         |  9 +--
 .../resources/OSGI-INF/metatype/metatype.xml  | 10 +++-
 .../ibm/ws/jsp/resources/messages.nlsprops    | 19 +++++--
 .../src/com/ibm/ws/jsp/JspOptions.java        | 53 ++++++++++++++---
 .../jsp/translator/compiler/JDTCompiler.java  | 37 ++++++------
 .../translator/compiler/JikesJspCompiler.java | 56 +++++++++---------
 .../compiler/StandardJspCompiler.java         | 57 ++++++++++---------
 .../compiler/utils/JspFileManager.java        | 17 ++++--
 8 files changed, 161 insertions(+), 97 deletions(-)

diff --git a/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties b/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
index f9c2bb3adc9c..0143604d7419 100644
--- a/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
+++ b/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
@@ -1,14 +1,11 @@
 ###############################################################################
-# Copyright (c) 2011, 2021 IBM Corporation and others.
+# Copyright (c) 2011, 2023 IBM Corporation and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-2.0/
 # 
 # SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
 ###############################################################################
 #
 #CMVCPATHNAME com.ibm.ws.jpa-2.2/resources/OSGI-INF/l10n/metatype.properties
@@ -25,8 +22,8 @@ disableJspRuntimeCompilation=Disable compilation of JSPs at runtime.
 extendedDocumentRoot.name=Extended document root
 extendedDocumentRoot=Directory that the JSP engine will search for additional JSP files to serve.
 
-jdkSourceLevel.name=JDK source level
-jdkSourceLevel=Default Java source level for JSPs compiled by the JSP engine.
+javaSourceLevel.name=Java source level
+javaSourceLevel=Default Java source level for JSPs compiled by the JSP engine.  Supports LTS releases: 8, 11, 17, and 21.
 
 keepGenerated.name=Keep generated Java source
 keepGenerated=Keep Java source files generated for JSPs.
diff --git a/dev/com.ibm.ws.jsp/resources/OSGI-INF/metatype/metatype.xml b/dev/com.ibm.ws.jsp/resources/OSGI-INF/metatype/metatype.xml
index 631c718af72e..3006fe6637a8 100644
--- a/dev/com.ibm.ws.jsp/resources/OSGI-INF/metatype/metatype.xml
+++ b/dev/com.ibm.ws.jsp/resources/OSGI-INF/metatype/metatype.xml
@@ -17,7 +17,15 @@
             id="disableJspRuntimeCompilation" required="false" type="Boolean" default="false"/>
         <AD description="%extendedDocumentRoot" name="%extendedDocumentRoot.name"
             id="extendedDocumentRoot" required="false" type="String" default="" /> 
-        <AD description="%jdkSourceLevel" name="%jdkSourceLevel.name"
+        <AD description="%javaSourceLevel" name="%javaSourceLevel.name"
+            id="javaSourceLevel" required="false" type="String">
+            <Option label="8" value="8"/>
+            <Option label="11" value="11"/>
+            <Option label="17" value="17"/>
+            <Option label="21" value="21"/>
+        </AD> 
+        <!-- Marked internal for compatibility reasons (for existing users), and recommending javaSourceLevel forward. See OLGH #7183  -->
+        <AD name="internal" description="internal use only"
             id="jdkSourceLevel" required="false" type="String">
             <Option label="13" value="13"/>
             <Option label="14" value="14"/>
diff --git a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
index 1d650fb476d0..7fca372ad8f3 100644
--- a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
+++ b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
@@ -6,9 +6,6 @@
 # http://www.eclipse.org/legal/epl-2.0/
 # 
 # SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
 ###############################################################################
 #CMVCPATHNAME ws/code/jsp/src/com/ibm/ws/jsp/resources/messages.nlsprops
 #COMPONENTPREFIX JSPG CWWJS
@@ -1273,11 +1270,23 @@ jsp.isthreadsafe.warning=CWWJS0003W: The Pages 3.1 specification strongly advise
 jsp.isthreadsafe.warning.explanation=SingleThreadModel was removed from Servlet 6.0. Pages 3.1 deprecated isThreadSafe with plans to remove it in a future Pages update.
 jsp.isthreadsafe.warning.useraction=Remove the isThreadSafe directive from all pages.
 
-
 jsp.useinmemory.warning=CWWJS0004W: The 'useInMemory' JSP Option is not supported. The JSPs will be compiled and saved on disk instead.
 jsp.useinmemory.warning.explanation=This feature was never ported from Traditional WebSphere for historical reasons.
 jsp.useinmemory.warning.useraction=Remove the useInMemory option from the server.xml, ibm-web-bnd.xml, or the ibm-web-ext.xmi files.
 
-pages.removed.element.error=CWWJS0005E: The {0} element was removed in Pages 4.0 and therefore is no longer supported.
+jsp.javasourcelevel.warning=CWWJS0004W: Requested javaSourceLevel={0} exceeds installed Java {1}, therefore forcing to {1}.
+jsp.javasourcelevel.warning.explanation=File cannot be compiled with a higher source than the available JDK level. 
+jsp.javasourcelevel.warning.useraction=Specify the javaSourceLevel at or below the available JDK level.
+
+jsp.bothsourcelevelset.warning=CWWJS0005W: Specified both javaSourceLevel={0} and jdkSourceLevel={1}. Defaulting to javaSourceLevel={0}
+jsp.bothsourcelevelset.warning.explanation= Only one source level attribute can be used at a time.
+jsp.bothsourcelevelset.warning.useraction= Select one source level attribute. javaSourceLevel is recommended as jdkSourceLevel is stabalized.  
+
+jsp.javasourcelevel.value=CWWJS0006I: The value of the JSP attribute javaSourceLevel is \"{0}\".
+jsp.javasourcelevel.value.explanation =
+jsp.javasourcelevel.value.useraction =
+
+pages.removed.element.error=CWWJS0007E: The {0} element was removed in Pages 4.0 and therefore is no longer supported.
 pages.removed.element.error.explanation=The jsp plugin and related actions were deprecated in Pages 3.1 and removed in 4.0. 
 pages.removed.element.error.useraction= Remove the jsp plugin, fallback, and params elements from your web app.
+
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/JspOptions.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/JspOptions.java
index db542ed9aa7e..bc43606edfad 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/JspOptions.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/JspOptions.java
@@ -6,9 +6,6 @@
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.jsp;
 
@@ -54,7 +51,8 @@ public class JspOptions {
     protected String     ieClassId = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93";
     protected boolean    isZOS = false;
     protected String     javaEncoding = "UTF-8";
-    private   int        jdkSourceLevel;
+    private   int        jdkSourceLevel = -1;
+    private   int        javaSourceLevel = -1; 
     protected String     jspCompileClasspath = null;
     protected boolean    keepGenerated = false;
     protected boolean    keepGeneratedclassfiles = true;
@@ -117,15 +115,15 @@ public class JspOptions {
     String overriddenJspOptions = new String();
     
     public JspOptions() {
-        setJdkSourceLevel(16);
+        setJavaSourceLevel(8); // Changed in PR 25494
     }   
     
     public JspOptions(Properties jspParams) {
-        setJdkSourceLevel(16);
+        setJavaSourceLevel(8); // Changed in PR 25494
         populateOptions(jspParams);
     }
     
-	public void populateOptions(Properties jspParams) {
+    public void populateOptions(Properties jspParams) {
 
 		/*--------------------*/
 		/* Load Option Values */
@@ -221,7 +219,9 @@ else if (useJikesCompiler.equalsIgnoreCase("false"))
         }
         
         int useJdkSourceLevel = -1;
+        int useJavaSourceLevel = -1;
         String rawJdkSourceLevel = jspParams.getProperty("jdkSourceLevel");
+        String rawJavaSourceLevel = jspParams.getProperty("javaSourceLevel");
         try {
             if (rawJdkSourceLevel != null)
                 useJdkSourceLevel = Integer.parseInt(rawJdkSourceLevel);
@@ -230,9 +230,29 @@ else if (useJikesCompiler.equalsIgnoreCase("false"))
                 logger.logp(Level.INFO, CLASS_NAME, "populateOptions", "Invalid value for jdkSourceLevel = " + rawJdkSourceLevel + ".");
             }
         }
-        if (useJdkSourceLevel >= 13) {
-            logger.logp(Level.INFO, CLASS_NAME, "populateOptions", JspMessages.getMessage("jsp.jdksourcelevel.value", new Object[] { useJdkSourceLevel })); //152472
+
+        if (rawJavaSourceLevel != null && (rawJavaSourceLevel.equals("8") || rawJavaSourceLevel.equals("1.8"))) // only for Java 8 do we accept 1.8 and 8
+            rawJavaSourceLevel =  org.eclipse.jdt.internal.compiler.impl.CompilerOptions.VERSION_1_8; 
+        try {
+            if (rawJavaSourceLevel != null)
+                useJavaSourceLevel = Integer.parseInt(rawJavaSourceLevel);            
+        } catch(NumberFormatException e) {
+            if (com.ibm.ejs.ras.TraceComponent.isAnyTracingEnabled() && logger.isLoggable(Level.INFO)) {
+                logger.logp(Level.INFO, CLASS_NAME, "populateOptions", "Invalid value for javaSourceLevel = " + rawJavaSourceLevel + ".");
+            }
+        }
+
+        if(useJavaSourceLevel != -1 && useJdkSourceLevel != -1) {
+            logger.logp(Level.WARNING, CLASS_NAME, "populateOptions", JspMessages.getMessage("jsp.bothsourcelevelset.warning", new Object[] { useJavaSourceLevel, useJdkSourceLevel }));
+            useJdkSourceLevel = -1;
+        }
+
+        if(useJavaSourceLevel != -1) {
+            setJavaSourceLevel(useJavaSourceLevel); //validation already done via metatype.xml options 
+            logger.logp(Level.INFO, CLASS_NAME, "populateOptions", JspMessages.getMessage("jsp.javasourcelevel.value", new Object[] { javaSourceLevel }));
+        } else if (useJdkSourceLevel >= 13) {
             setJdkSourceLevel(useJdkSourceLevel);
+            logger.logp(Level.INFO, CLASS_NAME, "populateOptions", JspMessages.getMessage("jsp.jdksourcelevel.value", new Object[] { useJdkSourceLevel })); //152472
         }
         
         // Normalize compileWithAssert and jdkSourceLevel; compileWithAssert with value true means compile with
@@ -1062,9 +1082,23 @@ public void setJdkSourceLevel(int jdkSourceLevel) {
         this.jdkSourceLevel = jdkSourceLevel;
     }
 
+    public void setJavaSourceLevel(int javaSourceLevel) {
+        int jmv = JavaInfo.majorVersion();
+        if (javaSourceLevel > jmv) {
+            // can not specify higher than running Java
+            logger.logp(Level.WARNING, CLASS_NAME, "setJavaSourceLevel", JspMessages.getMessage("jsp.javasourcelevel.warning", new Object[] { javaSourceLevel, jmv }));
+            javaSourceLevel = jmv;
+        }
+        this.javaSourceLevel = javaSourceLevel;
+    }
+    
     public int getJdkSourceLevel() {
         return jdkSourceLevel;
     }
+    
+    public int getJavaSourceLevel() {
+        return javaSourceLevel;
+    }
 
     public void setVerbose(boolean verbose) {
         this.verbose = verbose;
@@ -1601,6 +1635,7 @@ public String toString() {	//overrride Object's toString to assist in debugging.
                 "ieClassId =                           [" + ieClassId +"]"+separatorString+
                 "isZOS =                               [" + isZOS +"]"+separatorString+
                 "javaEncoding =                        [" + javaEncoding +"]"+separatorString+
+                "javaSourceLevel =                     [" + javaSourceLevel +"]"+separatorString+
                 "jdkSourceLevel =                      [" + jdkSourceLevel +"]"+separatorString+
                 "jspCompileClasspath =                 [" + tmpJspCompileClasspath +"]"+separatorString+
                 "keepGenerated =                       [" + keepGenerated +"]"+separatorString+
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
index 6c5d9c6d5b92..ecd50bd78e5d 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 1997, 2021 IBM Corporation and others.
+ * Copyright (c) 1997, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.jsp.translator.compiler;
 
@@ -71,18 +68,20 @@ public class JDTCompiler implements JspCompiler {
         private boolean isVerbose = false;
         private boolean isDeprecation = false; 
         private int jdkSourceLevel;
+        private Integer javaSourceLevel;
         private boolean useFullPackageNames = false;
         
         public JDTCompiler(ClassLoader loader, JspOptions options) {
                 this.loader = loader;
                 javaEncoding = options.getJavaEncoding();
                 outputDir = options.getOutputDir().getPath();
-        isClassDebugInfo = options.isClassDebugInfo();
-        isDebugEnabled = options.isDebugEnabled();
-        isVerbose = options.isVerbose();
-        isDeprecation =  options.isDeprecation();
-        jdkSourceLevel =  options.getJdkSourceLevel();
-        useFullPackageNames = options.isUseFullPackageNames();
+                isClassDebugInfo = options.isClassDebugInfo();
+                isDebugEnabled = options.isDebugEnabled();
+                isVerbose = options.isVerbose();
+                isDeprecation =  options.isDeprecation();
+                jdkSourceLevel =  options.getJdkSourceLevel();
+                javaSourceLevel =  options.getJavaSourceLevel();
+                useFullPackageNames = options.isUseFullPackageNames();
         if (com.ibm.ejs.ras.TraceComponent.isAnyTracingEnabled()&&logger.isLoggable(Level.FINE)) {
             logger.logp(Level.FINE, CLASS_NAME, "JDTCompiler", "Entering JDTCompiler.");
         }
@@ -112,8 +111,12 @@ public JspCompilerResult compile(JspResources[] jspResources, JspResources[] dep
         }
         compilerOptionsMap.put(CompilerOptions.OPTION_Encoding, javaEncoding);
         
-        //487396.1 jdkSourceLevel is 15 by default now ... should get into if statement
-        if (jdkSourceLevel == 14) {
+        if (javaSourceLevel != -1) {
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, javaSourceLevel.toString());
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, javaSourceLevel.toString());  
+            compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, javaSourceLevel.toString());  
+        }
+        else if (jdkSourceLevel == 14) {
             compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
             compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_4);  //PM32704
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4);  //PM32704
@@ -125,20 +128,20 @@ else if (jdkSourceLevel == 15) {
         }
         //PM04610 start
         else if (jdkSourceLevel == 16) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); 
             compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);  // 341708        
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); // 412312
         }
         //PM04610 end
         else if (jdkSourceLevel == 17) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
-            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7);       
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); 
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); 
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7);
         }
         //126902 start
         else if (jdkSourceLevel == 18) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
-            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);  
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8); 
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8); 
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_8);
         }
         //126902 end
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JikesJspCompiler.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JikesJspCompiler.java
index 1a600e55b23f..79ea25a67463 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JikesJspCompiler.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JikesJspCompiler.java
@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 1997, 2004 IBM Corporation and others.
+ * Copyright (c) 1997, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.jsp.translator.compiler;
 
@@ -52,6 +49,7 @@ public class JikesJspCompiler implements JspCompiler {
     protected boolean isVerbose = false;
     protected boolean isDeprecation = false;
     protected int jdkSourceLevel;
+    protected Integer javaSourceLevel;
 
     protected boolean useOptimizedClasspath = false;
     protected String absouluteContextRoot = null;
@@ -69,6 +67,7 @@ public JikesJspCompiler(String absouluteContextRoot, JspClassloaderContext class
         this.isVerbose = options.isVerbose();
         this.isDeprecation =  options.isDeprecation();
         jdkSourceLevel =  options.getJdkSourceLevel();
+        javaSourceLevel = options.getJavaSourceLevel();
         out = new CharArrayWriter();
 
     }
@@ -199,30 +198,33 @@ private List buildArgList(String source, List compilerOptions, String classpath)
             argList.add("-deprecation");
         }
 
-        // Jikes must default to -source 1.3; override if jdkSourceLevel is set 
-        //487396.1 jdkSourceLevel is 15 by default now ... should get into if statement
         argList.add("-source");
-        if (jdkSourceLevel == 14) {
-            argList.add("1.4");
-        }
-        else if (jdkSourceLevel == 15) {
-            argList.add("1.5");
-        }
-        // PM04610 start
-        else if (jdkSourceLevel == 16) {
-            argList.add("1.6");
-        }
-        // PM04610 end
-        else if (jdkSourceLevel == 17) {
-            argList.add("1.7");
-        }
-        // 126902 start
-        else if (jdkSourceLevel == 18) {
-            argList.add("1.8");
-        }
-        // 126902 end
-        else {
-            argList.add("1.3");
+        if (javaSourceLevel != -1) { // 7183
+            argList.add(javaSourceLevel.toString());
+        } else {
+            // Jikes must default to -source 1.3; override if jdkSourceLevel is set 
+            if (jdkSourceLevel == 14) {
+                argList.add("1.4");
+            }
+            else if (jdkSourceLevel == 15) {
+                argList.add("1.5");
+            }
+            // PM04610 start
+            else if (jdkSourceLevel == 16) {
+                argList.add("1.6");
+            }
+            // PM04610 end
+            else if (jdkSourceLevel == 17) {
+                argList.add("1.7");
+            }
+            // 126902 start
+            else if (jdkSourceLevel == 18) {
+                argList.add("1.8");
+            }
+            // 126902 end
+            else {
+                argList.add("1.3");
+            }
         }
 
         argList.add("-sourcepath");
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/StandardJspCompiler.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/StandardJspCompiler.java
index 6b9f7552cbb7..643c91b6392a 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/StandardJspCompiler.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/StandardJspCompiler.java
@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 1997, 2004 IBM Corporation and others.
+ * Copyright (c) 1997, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 
 package com.ibm.ws.jsp.translator.compiler;
@@ -53,7 +50,8 @@ public class StandardJspCompiler implements JspCompiler  {
     protected boolean isDebugEnabled = false;
     protected boolean isVerbose = false;
     protected boolean isDeprecation = false; 
-    protected int jdkSourceLevel; 
+    protected int jdkSourceLevel;
+    protected Integer javaSourceLevel; 
     protected String javaEncoding = null; 
     protected String outputDir = null;
     protected JavaCompiler compiler;
@@ -76,6 +74,7 @@ public StandardJspCompiler(JspClassloaderContext context, JspOptions options, St
         this.isDeprecation =  options.isDeprecation();
         this.javaEncoding = options.getJavaEncoding();
         this.jdkSourceLevel=  options.getJdkSourceLevel();
+        this.javaSourceLevel = options.getJavaSourceLevel();
         this.outputDir = options.getOutputDir().getPath();
 
         if (com.ibm.ejs.ras.TraceComponent.isAnyTracingEnabled()&&logger.isLoggable(Level.FINE)) {
@@ -184,29 +183,33 @@ private List<String> buildArgList(List compilerOptions, String outputDirectory)
             argList.add("-deprecation");
         }
         
-        //487396.1 jdkSourceLevel is 15 by default now ... should get into if statement
         argList.add("-source");
-        if (jdkSourceLevel == 14) {
-            argList.add("1.4");
-        }
-        else if (jdkSourceLevel == 15) {
-            argList.add("1.5");
-        }
-        //PM04610 start
-        else if (jdkSourceLevel == 16) {
-            argList.add("1.6");
-        }
-        //PM04610 end
-        else if (jdkSourceLevel == 17) {
-            argList.add("1.7");
-        }
-        //126902 start
-        else if (jdkSourceLevel == 18) {
-            argList.add("1.8");
-        }
-        //126902 end
-        else {
-            argList.add("1.3");
+        // issue 7183: look at javaSourceLevel first before using jdkSourceLevel
+        if (javaSourceLevel != -1) {
+            argList.add(javaSourceLevel.toString());
+        } else {
+            if (jdkSourceLevel == 14) {
+                argList.add("1.4");
+            }
+            else if (jdkSourceLevel == 15) {
+                argList.add("1.5");
+            }
+            //PM04610 start
+            else if (jdkSourceLevel == 16) {
+                argList.add("1.6");
+            }
+            //PM04610 end
+            else if (jdkSourceLevel == 17) {
+                argList.add("1.7");
+            }
+            //126902 start
+            else if (jdkSourceLevel == 18) {
+                argList.add("1.8");
+            }
+            //126902 end
+            else {
+                argList.add("1.3");
+            }
         }
         
         // Annotations don't need to be processed for JSPs.
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/utils/JspFileManager.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/utils/JspFileManager.java
index 44fb885186c9..7b1bdc5baf1a 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/utils/JspFileManager.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/utils/JspFileManager.java
@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2016 IBM Corporation and others.
+ * Copyright (c) 2016, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.jsp.translator.compiler.utils;
 
@@ -51,6 +48,7 @@
 import org.osgi.framework.wiring.BundleWiring;
 
 import com.ibm.ws.artifact.url.WSJarURLConnection;
+import com.ibm.ws.kernel.service.util.JavaInfo;
 import com.ibm.wsspi.jsp.resource.translation.JspResources;
 
 public class JspFileManager extends ForwardingJavaFileManager<JavaFileManager> {
@@ -66,6 +64,8 @@ public class JspFileManager extends ForwardingJavaFileManager<JavaFileManager> {
     private static final String CLASS_NAME = "com.ibm.ws.jsp.translator.compiler.utils.JspFileManager";
     private boolean areTagFiles = false;
 
+    private static int JAVA_MAJOR_VERSION = JavaInfo.majorVersion();
+
     public JspFileManager(JavaFileManager fileManager, ClassLoader classLoader) {
         super(fileManager);
         this.classLoader = classLoader;
@@ -76,6 +76,12 @@ public JspFileManager(JavaFileManager fileManager, ClassLoader classLoader) {
         }
     }
 
+    // May be needed for Java Modules? Requires JDK 9+
+    // @Override
+    // public Iterable<Set<Location>> listLocationsForModules(Location location) throws IOException, UnsupportedOperationException, IllegalArgumentException {
+    //     return super.listLocationsForModules(location);
+    // }
+
     @Override
     public Iterable<JavaFileObject> list(Location location, String packageName, 
                                          Set<Kind> kinds, boolean recurse) throws IOException {
@@ -83,9 +89,10 @@ public Iterable<JavaFileObject> list(Location location, String packageName,
             logger.logp(Level.FINE, CLASS_NAME, "list", "Looking for classes in package = " + packageName + " from location = " + location.getName());
         }
         Iterable<JavaFileObject> results = new ArrayList<JavaFileObject>();
-        
         if (location == StandardLocation.PLATFORM_CLASS_PATH) // let standard manager handle
             results = super.list(location, packageName, kinds, recurse);
+        else if (JAVA_MAJOR_VERSION >= 9 && location.getName().equals("SYSTEM_MODULES[java.base]")) // base module for 9+
+            results = super.list(location, packageName, kinds, recurse);
         else if (location == StandardLocation.CLASS_PATH && kinds.contains(JavaFileObject.Kind.CLASS)) {
             results = super.list(location, packageName, kinds, recurse);
             /* 

From dc532ae5d528622cadfb105263883a934365dc52 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Wed, 13 Dec 2023 11:34:25 -0500
Subject: [PATCH 3/6] Create Java 11, 17, & 21 Tests for JSP

---
 dev/com.ibm.ws.jsp.2.3_fat/bnd.bnd            |   3 -
 dev/com.ibm.ws.jsp.2.3_fat/build.gradle       |   3 -
 .../src/com/ibm/ws/jsp23/fat/FATSuite.java    |   6 +
 .../ibm/ws/jsp23/fat/tests/JSPJava11Test.java | 126 ++++++++++++++
 .../ibm/ws/jsp23/fat/tests/JSPJava17Test.java | 154 ++++++++++++++++++
 .../ibm/ws/jsp23/fat/tests/JSPJava21Test.java | 126 ++++++++++++++
 .../ibm/ws/jsp23/fat/tests/JSPJava8Test.java  |  34 +++-
 .../servers/jspJava11Server/.gitignore        |   1 +
 .../jspJava11Server/bootstrap.properties      |  12 ++
 .../servers/jspJava11Server/server.xml        |  23 +++
 .../servers/jspJava17Server/.gitignore        |   1 +
 .../jspJava17Server/bootstrap.properties      |  12 ++
 .../servers/jspJava17Server/server.xml        |  25 +++
 .../servers/jspJava21Server/.gitignore        |   1 +
 .../jspJava21Server/bootstrap.properties      |  12 ++
 .../servers/jspJava21Server/server.xml        |  25 +++
 .../jspJava8Server/bootstrap.properties       |   3 -
 .../publish/servers/jspJava8Server/server.xml |   5 +-
 .../META-INF/permissions.xml                  |  22 +++
 .../resources/WEB-INF/web.xml                 |  19 +++
 .../TestJSPWithJava11.war/resources/index.jsp |  34 ++++
 .../META-INF/permissions.xml                  |  22 +++
 .../resources/WEB-INF/web.xml                 |  19 +++
 .../TestJSPWithJava17.war/resources/index.jsp |  36 ++++
 .../META-INF/permissions.xml                  |  22 +++
 .../resources/WEB-INF/web.xml                 |  19 +++
 .../TestJSPWithJava21.war/resources/index.jsp |  37 +++++
 .../META-INF/permissions.xml                  |  22 +++
 .../resources/WEB-INF/web.xml                 |   3 -
 .../TestJSPWithJava8.war/resources/index.jsp  |   3 -
 .../simplicity/config/JspEngineElement.java   |  37 ++++-
 31 files changed, 840 insertions(+), 27 deletions(-)
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/.gitignore
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/.gitignore
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/.gitignore
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/index.jsp
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/WEB-INF/web.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/index.jsp
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/WEB-INF/web.xml
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
 create mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml

diff --git a/dev/com.ibm.ws.jsp.2.3_fat/bnd.bnd b/dev/com.ibm.ws.jsp.2.3_fat/bnd.bnd
index 32319cf15e35..1601cf83cc9b 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/bnd.bnd
+++ b/dev/com.ibm.ws.jsp.2.3_fat/bnd.bnd
@@ -6,9 +6,6 @@
 # http://www.eclipse.org/legal/epl-2.0/
 #
 # SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
 #*******************************************************************************
 -include= ~../cnf/resources/bnd/bundle.props
 bVersion=1.0
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/build.gradle b/dev/com.ibm.ws.jsp.2.3_fat/build.gradle
index 02217c9ba72d..46569dce71d4 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/build.gradle
+++ b/dev/com.ibm.ws.jsp.2.3_fat/build.gradle
@@ -6,9 +6,6 @@
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 dependencies {
     requiredLibs project(':io.openliberty.org.apache.commons.codec'),
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/FATSuite.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/FATSuite.java
index 61c7f4ad9faf..af85d2f26680 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/FATSuite.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/FATSuite.java
@@ -19,6 +19,9 @@
 import com.ibm.ws.jsp23.fat.tests.JSP23JSP22ServerTest;
 import com.ibm.ws.jsp23.fat.tests.JSPCdiTest;
 import com.ibm.ws.jsp23.fat.tests.JSPExceptionTests;
+import com.ibm.ws.jsp23.fat.tests.JSPJava11Test;
+import com.ibm.ws.jsp23.fat.tests.JSPJava17Test;
+import com.ibm.ws.jsp23.fat.tests.JSPJava21Test;
 import com.ibm.ws.jsp23.fat.tests.JSPJava8Test;
 import com.ibm.ws.jsp23.fat.tests.JSPPrepareJSPThreadCountDefaultValueTests;
 import com.ibm.ws.jsp23.fat.tests.JSPPrepareJSPThreadCountNonDefaultValueTests;
@@ -42,6 +45,9 @@
                 JSPExceptionTests.class,
                 JSPSkipMetaInfTests.class,
                 JSPJava8Test.class,
+                JSPJava11Test.class,
+                JSPJava17Test.class,
+                JSPJava21Test.class,
                 JSPCdiTest.class,
                 JSP23JSP22ServerTest.class,
                 JSPPrepareJSPThreadCountNonDefaultValueTests.class,
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
new file mode 100644
index 000000000000..bdb0c02b0d12
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package com.ibm.ws.jsp23.fat.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.logging.Logger;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.ShrinkHelper;
+import com.ibm.websphere.simplicity.config.ServerConfiguration;
+import com.ibm.ws.jsp23.fat.JSPUtils;
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+import componenttest.annotation.MinimumJavaLevel;
+import componenttest.annotation.Server;
+import componenttest.annotation.SkipForRepeat;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.custom.junit.runner.Mode;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.topology.impl.LibertyServer;
+
+/**
+ * JSP 2.3 tests which use Java 11 specific features.
+ *
+ * Tests must only run when Java 11 is in use. Runs only in FULL as Java 8 and 17 test also cover these options.
+ *
+ * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ *
+ */
+// No need to run against cdi-2.0 since these tests don't use CDI at all.
+@Mode(TestMode.FULL)
+@MinimumJavaLevel(javaLevel = 11)
+@SkipForRepeat("CDI-2.0")
+@RunWith(FATRunner.class)
+public class JSPJava11Test {
+    private static final String APP_NAME = "TestJSPWithJava11";
+    private static final Logger LOG = Logger.getLogger(JSPJava11Test.class.getName());
+
+    @Server("jspJava11Server")
+    public static LibertyServer server;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        ShrinkHelper.defaultDropinApp(server, APP_NAME + ".war");
+
+        server.startServer(JSPJava11Test.class.getSimpleName() + ".log");
+    }
+
+    @AfterClass
+    public static void testCleanup() throws Exception {
+        // Stop the server
+        if (server != null && server.isStarted()) {
+            server.stopServer();
+        }
+    }
+
+    /**
+     * Simple test for index.jsp. Page uses Java 11's String#strip method
+     *
+     * @throws Exception
+     *                       if something goes horribly wrong
+     */
+    @Test
+    public void testJava11JSP() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("Java 11's String strip() method failed", response.getText().contains("success-strip"));
+        assertTrue("Java 11's String lines() did not return a stream.", response.getText().contains("java.util.stream.ReferencePipeline"));
+        assertTrue("Java 11's Map copyOf method failed", response.getText().contains("{key=success-copyof}"));
+    }
+
+    @Test
+    public void testJava11viaUseJDKCompiler() throws Exception {
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        configuration.getJspEngine().setUseJDKCompiler(true);
+        LOG.info("New server configuration used: " + configuration);
+        server.setMarkToEndOfLog();
+        server.updateServerConfiguration(configuration);
+        server.restartApplication(APP_NAME);
+        server.waitForConfigUpdateInLogUsingMark(Collections.singleton(APP_NAME), false, "CWWKT0016I:.*TestJSPWithJava11.*");
+
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("Java 11's String strip() method failed", response.getText().contains("success-strip"));
+        assertTrue("Java 11's String lines() did not return a stream.", response.getText().contains("java.util.stream.ReferencePipeline"));
+        assertTrue("Java 11's Map copyOf method failed", response.getText().contains("{key=success-copyof}"));
+    }
+}
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
new file mode 100644
index 000000000000..3fd8da1df481
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package com.ibm.ws.jsp23.fat.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.logging.Logger;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.ShrinkHelper;
+import com.ibm.ws.jsp23.fat.JSPUtils;
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+import componenttest.annotation.MinimumJavaLevel;
+import componenttest.annotation.MaximumJavaLevel;
+import componenttest.annotation.Server;
+import componenttest.annotation.SkipForRepeat;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.topology.impl.LibertyServer;
+
+import com.ibm.websphere.simplicity.config.ServerConfiguration;
+/**
+ * JSP 2.3 tests which use Java 17 specific features.
+ *
+ * Tests must only run when Java 17 is in use.
+ *
+ * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ *
+ */
+// No need to run against cdi-2.0 since these tests don't use CDI at all.
+@MinimumJavaLevel(javaLevel = 17)
+@SkipForRepeat("CDI-2.0")
+@RunWith(FATRunner.class)
+public class JSPJava17Test {
+    private static final String APP_NAME = "TestJSPWithJava17";
+    private static final Logger LOG = Logger.getLogger(JSPJava17Test.class.getName());
+
+    @Server("jspJava17Server")
+    public static LibertyServer server;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        ShrinkHelper.defaultDropinApp(server, APP_NAME + ".war");
+
+        server.startServer(JSPJava17Test.class.getSimpleName() + ".log");
+    }
+
+    @AfterClass
+    public static void testCleanup() throws Exception {
+        // Stop the server
+        if (server != null && server.isStarted()) {
+            server.stopServer();
+        }
+    }
+
+    /**
+     * Simple test for index.jsp. Page uses Java 17's instanceof pattern matching
+     *
+     * @throws Exception
+     *                       if something goes horribly wrong
+     */
+    @Test
+    public void testJava17JSP() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: success", response.getText().contains("success-text-block"));
+        assertTrue("The response did not contain: success", response.getText().contains("success-pattern-matching"));
+    }
+
+    @Test
+    public void testJava17viaUseJDKCompiler() throws Exception {
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        configuration.getJspEngine().setUseJDKCompiler(true);
+        LOG.info("New server configuration used: " + configuration);
+
+        server.setMarkToEndOfLog();
+        server.updateServerConfiguration(configuration);
+        server.restartApplication(APP_NAME);
+        server.waitForConfigUpdateInLogUsingMark(Collections.singleton(APP_NAME), false, "CWWKT0016I:.*TestJSPWithJava17.*");
+
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: success", response.getText().contains("success-text-block"));
+        assertTrue("The response did not contain: success", response.getText().contains("success-pattern-matching"));
+    }
+
+    /*
+     * Verifies that javaSourceLevel overrides jdkSourceLevel if both are set.
+     */
+    @Test
+    public void testBothjdkSourceLevelAndjavaSourceLevel() throws Exception {
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        configuration.getJspEngine().setJdkSourceLevel("18");
+        LOG.info("New server configuration used: " + configuration);
+
+        server.setMarkToEndOfLog();
+        server.updateServerConfiguration(configuration);
+        server.restartApplication(APP_NAME);
+        server.waitForConfigUpdateInLogUsingMark(Collections.singleton(APP_NAME), false, "CWWKT0016I:.*TestJSPWithJava17.*");
+
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: success", response.getText().contains("success-text-block"));
+        assertTrue("The response did not contain: success", response.getText().contains("success-pattern-matching"));
+    }
+}
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
new file mode 100644
index 000000000000..bbcb94c28608
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
@@ -0,0 +1,126 @@
+/*******************************************************************************
+ * Copyright (c) 2023 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+package com.ibm.ws.jsp23.fat.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collections;
+import java.util.logging.Logger;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.ibm.websphere.simplicity.ShrinkHelper;
+import com.ibm.ws.jsp23.fat.JSPUtils;
+import com.meterware.httpunit.GetMethodWebRequest;
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.WebResponse;
+
+import componenttest.annotation.MinimumJavaLevel;
+import componenttest.annotation.MaximumJavaLevel;
+import componenttest.annotation.Server;
+import componenttest.annotation.SkipForRepeat;
+import componenttest.custom.junit.runner.FATRunner;
+import componenttest.custom.junit.runner.Mode;
+import componenttest.custom.junit.runner.Mode.TestMode;
+import componenttest.topology.impl.LibertyServer;
+
+import com.ibm.websphere.simplicity.config.ServerConfiguration;
+/**
+ * JSP 2.3 tests which use Java 21 specific features.
+ *
+ * Tests must only run when Java 21 is in use.
+ *
+ * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ *
+ */
+// No need to run against cdi-2.0 since these tests don't use CDI at all.
+@Mode(TestMode.FULL)
+@MinimumJavaLevel(javaLevel = 21)
+@SkipForRepeat("CDI-2.0")
+@RunWith(FATRunner.class)
+public class JSPJava21Test {
+    private static final String APP_NAME = "TestJSPWithJava21";
+    private static final Logger LOG = Logger.getLogger(JSPJava21Test.class.getName());
+
+    @Server("jspJava21Server")
+    public static LibertyServer server;
+
+    @BeforeClass
+    public static void setup() throws Exception {
+        ShrinkHelper.defaultDropinApp(server, APP_NAME + ".war");
+
+        server.startServer(JSPJava21Test.class.getSimpleName() + ".log");
+    }
+
+    @AfterClass
+    public static void testCleanup() throws Exception {
+        // Stop the server
+        if (server != null && server.isStarted()) {
+            server.stopServer();
+        }
+    }
+
+    /**
+     * Simple test for index.jsp. Page uses Java 21's instanceof pattern matching
+     *
+     * @throws Exception
+     *                       if something goes horribly wrong
+     */
+    @Test
+    public void testJava21JSP() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: success", response.getText().contains("getFirst success!"));
+        assertTrue("The response did not contain: success", response.getText().contains("switch success!"));
+    }
+
+    @Test
+    public void testJava21viaUseJDKCompiler() throws Exception {
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        configuration.getJspEngine().setUseJDKCompiler(true);
+        LOG.info("New server configuration used: " + configuration);
+
+        server.setMarkToEndOfLog();
+        server.updateServerConfiguration(configuration);
+        server.restartApplication(APP_NAME);
+        server.waitForConfigUpdateInLogUsingMark(Collections.singleton(APP_NAME), false, "CWWKT0016I:.*TestJSPWithJava21.*");
+
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: success", response.getText().contains("getFirst success!"));
+        assertTrue("The response did not contain: success", response.getText().contains("switch success!"));
+    }
+}
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
index 8d8effad2be8..51479e07a4e5 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
@@ -6,15 +6,13 @@
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.ws.jsp23.fat.tests;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import java.util.Collections;
 import java.util.logging.Logger;
 
 import org.junit.AfterClass;
@@ -34,6 +32,7 @@
 import componenttest.custom.junit.runner.FATRunner;
 import componenttest.topology.impl.LibertyServer;
 
+import com.ibm.websphere.simplicity.config.ServerConfiguration;
 /**
  * JSP 2.3 tests which use Java 1.8 specific features.
  *
@@ -71,7 +70,7 @@ public static void testCleanup() throws Exception {
      * Simple test for Index.jsp
      *
      * @throws Exception
-     *             if something goes horribly wrong
+     *                       if something goes horribly wrong
      */
     @Test
     public void testJava8JSP() throws Exception {
@@ -89,4 +88,31 @@ public void testJava8JSP() throws Exception {
                      200, response.getResponseCode());
         assertTrue("The response did not contain: onetwothreefour", response.getText().contains("onetwothreefour"));
     }
+
+    @Test
+    public void testJava8viaUseJDKCompiler() throws Exception {
+
+        ServerConfiguration configuration = server.getServerConfiguration();
+        configuration.getJspEngine().setUseJDKCompiler(true);
+        LOG.info("New server configuration used: " + configuration);
+
+        server.setMarkToEndOfLog();
+        server.updateServerConfiguration(configuration);
+        server.restartApplication(APP_NAME);
+        server.waitForConfigUpdateInLogUsingMark(Collections.singleton(APP_NAME), false, "CWWKT0016I:.*TestJSPWithJava8.*");
+
+        WebConversation wc = new WebConversation();
+        wc.setExceptionsThrownOnErrorStatus(false);
+
+        String url = JSPUtils.createHttpUrlString(server, APP_NAME, "index.jsp");
+        LOG.info("url: " + url);
+
+        WebRequest request = new GetMethodWebRequest(url);
+        WebResponse response = wc.getResponse(request);
+        LOG.info("Servlet response : " + response.getText());
+
+        assertEquals("Expected " + 200 + " status code was not returned!",
+                     200, response.getResponseCode());
+        assertTrue("The response did not contain: onetwothreefour", response.getText().contains("onetwothreefour"));
+    }
 }
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/.gitignore b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/.gitignore
new file mode 100644
index 000000000000..f3f483d82c07
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/.gitignore
@@ -0,0 +1 @@
+/dropins
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
new file mode 100644
index 000000000000..1df2a95eff71
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2023 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-2.0/
+# 
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+bootstrap.include=../testports.properties
+osgi.console=7777
+com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
new file mode 100644
index 000000000000..cc9226985ed8
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
@@ -0,0 +1,23 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<server description="Server for testing JavaServer Pages 2.3">
+
+    <include location="../fatTestPorts.xml"/>
+
+    <featureManager>
+        <feature>jsp-2.3</feature>
+        <feature>localConnector-1.0</feature>
+    </featureManager>
+
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+
+    <jspEngine javaSourceLevel="11"/>
+
+</server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/.gitignore b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/.gitignore
new file mode 100644
index 000000000000..f3f483d82c07
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/.gitignore
@@ -0,0 +1 @@
+/dropins
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
new file mode 100644
index 000000000000..1df2a95eff71
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2023 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-2.0/
+# 
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+bootstrap.include=../testports.properties
+osgi.console=7777
+com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
new file mode 100644
index 000000000000..7d65b5933efb
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<server description="Server for testing JavaServer Pages 2.3">
+
+    <include location="../fatTestPorts.xml"/>
+
+    <featureManager>
+        <feature>jsp-2.3</feature>
+        <feature>localConnector-1.0</feature>
+    </featureManager>
+
+
+
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+
+    <jspEngine javaSourceLevel="17"/>
+
+</server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/.gitignore b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/.gitignore
new file mode 100644
index 000000000000..f3f483d82c07
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/.gitignore
@@ -0,0 +1 @@
+/dropins
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
new file mode 100644
index 000000000000..1df2a95eff71
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2023 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-2.0/
+# 
+# SPDX-License-Identifier: EPL-2.0
+###############################################################################
+bootstrap.include=../testports.properties
+osgi.console=7777
+com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
new file mode 100644
index 000000000000..49fd719e4ef5
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
@@ -0,0 +1,25 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<server description="Server for testing JavaServer Pages 2.3">
+
+    <include location="../fatTestPorts.xml"/>
+
+    <featureManager>
+        <feature>jsp-2.3</feature>
+        <feature>localConnector-1.0</feature>
+    </featureManager>
+
+
+
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+
+    <jspEngine javaSourceLevel="21"/>
+
+</server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/bootstrap.properties
index 61f538a150a1..c0ee80dacbfc 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/bootstrap.properties
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/bootstrap.properties
@@ -6,9 +6,6 @@
 # http://www.eclipse.org/legal/epl-2.0/
 # 
 # SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
 ###############################################################################
 bootstrap.include=../testports.properties
 osgi.console=7777
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
index ef2192b8cf33..4cd37b71f284 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
@@ -6,9 +6,6 @@
     http://www.eclipse.org/legal/epl-2.0/
     
     SPDX-License-Identifier: EPL-2.0
-   
-    Contributors:
-        IBM Corporation - initial API and implementation
  -->
 <server description="Server for testing JavaServer Pages 2.3">
 
@@ -16,8 +13,10 @@
 
     <featureManager>
         <feature>jsp-2.3</feature>
+        <feature>localConnector-1.0</feature>
     </featureManager>
 
+    <!-- Note: jdkSourceLevel has been marked internal -->
     <jspEngine jdkSourceLevel="18"/>
 
     <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="20" maxFiles="10" traceFormat="BASIC"/>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
new file mode 100644
index 000000000000..75cec1550725
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+    version="7">
+
+   <permission>
+      <class-name>java.lang.RuntimePermission</class-name>
+      <name>getClassLoader</name>
+   </permission>
+
+</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
new file mode 100644
index 000000000000..6c0fe3ace877
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<web-app
+    version="3.1"
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+
+  <display-name>TestJSPWithJava17</display-name>
+    
+</web-app>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/index.jsp b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/index.jsp
new file mode 100644
index 000000000000..5c58680f3400
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/index.jsp
@@ -0,0 +1,34 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+        <title>Test Java 11 Compilation</title>
+    </head>
+
+    <body>
+        Testing Java 11's String.strip function:
+        <% out.print(" success-strip ".strip()); %> 
+        <br/>
+
+        Testing Java 11's String.lines function: 
+        <% out.println(" Hello World\n Good Bye\n success-lines".lines()); %>
+        <br />
+
+        Java 10's Map.copyOf static method
+        <% 
+            java.util.Map<String,String> map = new java.util.HashMap<String,String>();
+            map.put("key","success-copyof");
+            out.println(java.util.Map.copyOf(map)); // {key=value}
+        %>
+    </body>
+</html>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
new file mode 100644
index 000000000000..75cec1550725
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+    version="7">
+
+   <permission>
+      <class-name>java.lang.RuntimePermission</class-name>
+      <name>getClassLoader</name>
+   </permission>
+
+</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/WEB-INF/web.xml
new file mode 100644
index 000000000000..6c0fe3ace877
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<web-app
+    version="3.1"
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+
+  <display-name>TestJSPWithJava17</display-name>
+    
+</web-app>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/index.jsp b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/index.jsp
new file mode 100644
index 000000000000..8839c220f05d
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/resources/index.jsp
@@ -0,0 +1,36 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<!DOCTYPE HTML>
+<html>
+
+  <head>
+    <title>Java 17</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+  </head>
+
+  <body>
+      <!-- Test Java 17's Text Block -->
+    <% 
+      String block = """
+        If this compiles, then the 
+        test passes. " success-text-block" woo!
+        """;
+      out.print(block);
+    %>
+
+      <!-- Test instanceOf Java 17's pattern matching  -->
+    <%
+      Object o = " success-pattern-matching ";
+      if (o instanceof String s) {
+        out.print(s.strip()); // no need to cast to String 
+      }
+    %>
+  </body>
+</html>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
new file mode 100644
index 000000000000..75cec1550725
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+    version="7">
+
+   <permission>
+      <class-name>java.lang.RuntimePermission</class-name>
+      <name>getClassLoader</name>
+   </permission>
+
+</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/WEB-INF/web.xml
new file mode 100644
index 000000000000..2b38942e9782
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/WEB-INF/web.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<web-app
+    version="3.1"
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+
+  <display-name>TestJSPWithJava21</display-name>
+    
+</web-app>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
new file mode 100644
index 000000000000..03ffcb61a702
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
@@ -0,0 +1,37 @@
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+ <!DOCTYPE HTML>
+ <html>
+ 
+   <head>
+     <title>Java 21</title>
+     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+   </head>
+ 
+   <body>
+       <!-- Test Java 21's Collection#getFirst method -->
+     <% 
+       java.util.ArrayList<String> list = new java.util.ArrayList<String>();
+       list.add("getFirst success!");
+       out.println(list.getFirst());
+     %>
+ 
+       <!-- Test instanceOf Java 21's Pattern Matching for Switch  -->
+     <%
+       Object test = "hello";
+       switch(test){
+         case Integer i -> out.println("switch fail!");
+         case String s ->  out.println("switch success!");
+         default  -> out.println("switch fail!");
+       }
+     %>
+   </body>
+ </html>
+ 
\ No newline at end of file
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml
new file mode 100644
index 000000000000..75cec1550725
--- /dev/null
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2023 IBM Corporation and others.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License 2.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-2.0/
+    
+    SPDX-License-Identifier: EPL-2.0
+ -->
+<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
+    version="7">
+
+   <permission>
+      <class-name>java.lang.RuntimePermission</class-name>
+      <name>getClassLoader</name>
+   </permission>
+
+</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/WEB-INF/web.xml
index 892a9c127a88..ae36211ec0d6 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/WEB-INF/web.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/WEB-INF/web.xml
@@ -7,9 +7,6 @@
     http://www.eclipse.org/legal/epl-2.0/
     
     SPDX-License-Identifier: EPL-2.0
-   
-    Contributors:
-        IBM Corporation - initial API and implementation
  -->
 <web-app
     version="3.1"
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/index.jsp b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/index.jsp
index 2cdf60b3d4c0..12bbc2582428 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/index.jsp
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/resources/index.jsp
@@ -6,9 +6,6 @@
     http://www.eclipse.org/legal/epl-2.0/
     
     SPDX-License-Identifier: EPL-2.0
-   
-    Contributors:
-        IBM Corporation - initial API and implementation
  -->
 <!DOCTYPE HTML><%@page import="java.io.PrintWriter"%>
 <%@page import="java.io.Writer"%>
diff --git a/dev/fattest.simplicity/src/com/ibm/websphere/simplicity/config/JspEngineElement.java b/dev/fattest.simplicity/src/com/ibm/websphere/simplicity/config/JspEngineElement.java
index d6eea1eed612..4001a2ec8b13 100644
--- a/dev/fattest.simplicity/src/com/ibm/websphere/simplicity/config/JspEngineElement.java
+++ b/dev/fattest.simplicity/src/com/ibm/websphere/simplicity/config/JspEngineElement.java
@@ -1,14 +1,11 @@
 /*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2023 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-2.0/
  * 
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package com.ibm.websphere.simplicity.config;
 
@@ -21,10 +18,12 @@ public class JspEngineElement extends ConfigElement {
     private Boolean useStringCast;
     private Boolean usescriptvardupinit;
     private String jdkSourceLevel;
+    private String javaSourceLevel;
     private Boolean disableResourceInjection;
     private Boolean disableTldSearch;
     private String scratchdir;
     private Boolean keepGenerated;
+    private Boolean useJDKCompiler;
 
     /**
      * @return the useStringCast
@@ -62,6 +61,18 @@ public void setJdkSourceLevel(String s) {
         this.jdkSourceLevel = s;
     }
 
+    /**
+     * @return the javaSourceLevel
+     */
+    public String getJavaSourceLevel() {
+        return javaSourceLevel;
+    }
+
+    @XmlAttribute(name = "javaSourceLevel")
+    public void setJavaSourceLevel(String s) {
+        this.javaSourceLevel = s;
+    }
+
     /**
      * @return the disableResourceInjection
      */
@@ -95,7 +106,7 @@ public void setScratchdir(String value) {
     public String getScratchdir() {
         return scratchdir;
     }
-    
+
     /**
      * @return the keepGenerated
      */
@@ -108,6 +119,18 @@ public void setKeepGenerated(Boolean b) {
         this.keepGenerated = b;
     }
 
+    /**
+     * @return the keepGenerated
+     */
+    public Boolean isUseJDKCompiler() {
+        return useJDKCompiler;
+    }
+
+    @XmlAttribute(name = "useJDKCompiler")
+    public void setUseJDKCompiler(Boolean b) {
+        this.useJDKCompiler = b;
+    }
+
     @Override
     public String toString() {
         StringBuffer buf = new StringBuffer("JspElement{");
@@ -117,6 +140,8 @@ public String toString() {
             buf.append("usescriptvardupinit=\"" + usescriptvardupinit + "\" ");
         if (jdkSourceLevel != null)
             buf.append("jdkSourceLevel=\"" + jdkSourceLevel + "\" ");
+        if (javaSourceLevel != null)
+            buf.append("javaSourceLevel=\"" + javaSourceLevel + "\" ");
         if (disableResourceInjection != null)
             buf.append("disableResourceInjection=\"" + disableResourceInjection + "\" ");
         if (disableTldSearch != null)
@@ -125,6 +150,8 @@ public String toString() {
             buf.append("scratchdir=\"" + scratchdir + "\" ");
         if (keepGenerated != null)
             buf.append("keepGenerated=\"" + keepGenerated + "\" ");
+        if (useJDKCompiler != null)
+            buf.append("useJDKCompiler=\"" + useJDKCompiler + "\" ");
 
         buf.append("}");
         return buf.toString();

From ebfa7da1ebfc091748f63fb8a2c2286d6cd45e03 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Wed, 13 Dec 2023 11:38:42 -0500
Subject: [PATCH 4/6]  Apply suggestions from code review

---
 .../resources/OSGI-INF/l10n/metatype.properties           | 2 +-
 .../resources/com/ibm/ws/jsp/resources/messages.nlsprops  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties b/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
index 0143604d7419..d4a9f78c6b79 100644
--- a/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
+++ b/dev/com.ibm.ws.jsp/resources/OSGI-INF/l10n/metatype.properties
@@ -23,7 +23,7 @@ extendedDocumentRoot.name=Extended document root
 extendedDocumentRoot=Directory that the JSP engine will search for additional JSP files to serve.
 
 javaSourceLevel.name=Java source level
-javaSourceLevel=Default Java source level for JSPs compiled by the JSP engine.  Supports LTS releases: 8, 11, 17, and 21.
+javaSourceLevel=Specifies the default Java source level for JSPs that are compiled by the JSP engine. Accepts one of the following LTS releases as a value: 8, 11, 17, and 21.
 
 keepGenerated.name=Keep generated Java source
 keepGenerated=Keep Java source files generated for JSPs.
diff --git a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
index 7fca372ad8f3..202b4d4e8789 100644
--- a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
+++ b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
@@ -1274,13 +1274,13 @@ jsp.useinmemory.warning=CWWJS0004W: The 'useInMemory' JSP Option is not supporte
 jsp.useinmemory.warning.explanation=This feature was never ported from Traditional WebSphere for historical reasons.
 jsp.useinmemory.warning.useraction=Remove the useInMemory option from the server.xml, ibm-web-bnd.xml, or the ibm-web-ext.xmi files.
 
-jsp.javasourcelevel.warning=CWWJS0004W: Requested javaSourceLevel={0} exceeds installed Java {1}, therefore forcing to {1}.
+jsp.javasourcelevel.warning=CWWJS0004W: The specified javaSourceLevel={0} value exceeds the {1} installed Java level. Therefore, the default Java level is set to {1}.
 jsp.javasourcelevel.warning.explanation=File cannot be compiled with a higher source than the available JDK level. 
-jsp.javasourcelevel.warning.useraction=Specify the javaSourceLevel at or below the available JDK level.
+jsp.javasourcelevel.warning.useraction=Specify a javaSourceLevel value that is less than or equal to the available JDK level.
 
-jsp.bothsourcelevelset.warning=CWWJS0005W: Specified both javaSourceLevel={0} and jdkSourceLevel={1}. Defaulting to javaSourceLevel={0}
+jsp.bothsourcelevelset.warning=CWWJS0005W: Both javaSourceLevel={0} and jdkSourceLevel={1} are specified. Defaulting to javaSourceLevel={0}
 jsp.bothsourcelevelset.warning.explanation= Only one source level attribute can be used at a time.
-jsp.bothsourcelevelset.warning.useraction= Select one source level attribute. javaSourceLevel is recommended as jdkSourceLevel is stabalized.  
+jsp.bothsourcelevelset.warning.useraction= Specify only the javaSourceLevel attribute.  The jdkSourceLevel attribute is stabilized. 
 
 jsp.javasourcelevel.value=CWWJS0006I: The value of the JSP attribute javaSourceLevel is \"{0}\".
 jsp.javasourcelevel.value.explanation =

From 9d463cdc5e017ba40f132c6f65ca07a7631231a0 Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Thu, 14 Dec 2023 11:01:59 -0500
Subject: [PATCH 5/6] Address code review comments

---
 .../ibm/ws/jsp23/fat/tests/JSPJava11Test.java | 15 ++++++++-----
 .../ibm/ws/jsp23/fat/tests/JSPJava17Test.java | 22 ++++++++++++-------
 .../ibm/ws/jsp23/fat/tests/JSPJava21Test.java | 15 ++++++++-----
 .../ibm/ws/jsp23/fat/tests/JSPJava8Test.java  | 10 ++++++++-
 .../jspJava11Server/bootstrap.properties      |  1 -
 .../servers/jspJava11Server/server.xml        |  2 +-
 .../jspJava17Server/bootstrap.properties      |  1 -
 .../servers/jspJava17Server/server.xml        |  6 ++---
 .../jspJava21Server/bootstrap.properties      |  1 -
 .../servers/jspJava21Server/server.xml        |  6 ++---
 .../publish/servers/jspJava8Server/server.xml |  6 ++---
 .../META-INF/permissions.xml                  | 22 -------------------
 .../resources/WEB-INF/web.xml                 |  2 +-
 .../META-INF/permissions.xml                  | 22 -------------------
 .../META-INF/permissions.xml                  | 22 -------------------
 .../TestJSPWithJava21.war/resources/index.jsp |  3 +--
 .../META-INF/permissions.xml                  | 22 -------------------
 .../jsp/translator/compiler/JDTCompiler.java  | 16 +++++++-------
 18 files changed, 61 insertions(+), 133 deletions(-)
 delete mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
 delete mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
 delete mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
 delete mode 100644 dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml

diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
index bdb0c02b0d12..eded92876326 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava11Test.java
@@ -39,15 +39,12 @@
 /**
  * JSP 2.3 tests which use Java 11 specific features.
  *
- * Tests must only run when Java 11 is in use. Runs only in FULL as Java 8 and 17 test also cover these options.
- *
- * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ * Tests must only run when Java 11 is in use.
  *
  */
-// No need to run against cdi-2.0 since these tests don't use CDI at all.
 @Mode(TestMode.FULL)
 @MinimumJavaLevel(javaLevel = 11)
-@SkipForRepeat("CDI-2.0")
+@SkipForRepeat("CDI-2.0") // No need to run against cdi-2.0 since these tests don't use CDI at all.
 @RunWith(FATRunner.class)
 public class JSPJava11Test {
     private static final String APP_NAME = "TestJSPWithJava11";
@@ -96,6 +93,14 @@ public void testJava11JSP() throws Exception {
         assertTrue("Java 11's Map copyOf method failed", response.getText().contains("{key=success-copyof}"));
     }
 
+    /**
+     * Same test as testJava11JSP, but using the runtime JDK (via JSP's useJDKCompiler option rather than the default Eclipse Compiler for Java (ECJ))
+     * 
+     * https://openliberty.io/docs/latest/reference/config/jspEngine.html
+     *
+     * @throws Exception if something goes horribly wrong
+     *                
+     */
     @Test
     public void testJava11viaUseJDKCompiler() throws Exception {
 
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
index 3fd8da1df481..d576b54aed54 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava17Test.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2023 IBM Corporation and others.
+ * Copyright (c) 2023, 2024 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -38,14 +38,11 @@
 /**
  * JSP 2.3 tests which use Java 17 specific features.
  *
- * Tests must only run when Java 17 is in use.
- *
- * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ * Tests must only run when Java 17 or later is in use.
  *
  */
-// No need to run against cdi-2.0 since these tests don't use CDI at all.
 @MinimumJavaLevel(javaLevel = 17)
-@SkipForRepeat("CDI-2.0")
+@SkipForRepeat("CDI-2.0") // No need to run against cdi-2.0 since these tests don't use CDI at all.
 @RunWith(FATRunner.class)
 public class JSPJava17Test {
     private static final String APP_NAME = "TestJSPWithJava17";
@@ -65,7 +62,8 @@ public static void setup() throws Exception {
     public static void testCleanup() throws Exception {
         // Stop the server
         if (server != null && server.isStarted()) {
-            server.stopServer();
+            // testBothjdkSourceLevelAndjavaSourceLevel causes CWWJS0005W: Both javaSourceLevel=17 and jdkSourceLevel=18 are specified. Defaulting to javaSourceLevel=17
+            server.stopServer("CWWJS0005W");
         }
     }
 
@@ -93,6 +91,14 @@ public void testJava17JSP() throws Exception {
         assertTrue("The response did not contain: success", response.getText().contains("success-pattern-matching"));
     }
 
+    /**
+     * Same test as testJava17JSP, but using the runtime JDK (via JSP's useJDKCompiler option rather than the default Eclipse Compiler for Java (ECJ))
+     *
+     * https://openliberty.io/docs/latest/reference/config/jspEngine.html
+     * 
+     * @throws Exception if something goes horribly wrong
+     *                
+     */
     @Test
     public void testJava17viaUseJDKCompiler() throws Exception {
 
@@ -122,7 +128,7 @@ public void testJava17viaUseJDKCompiler() throws Exception {
     }
 
     /*
-     * Verifies that javaSourceLevel overrides jdkSourceLevel if both are set.
+     * Verifies that javaSourceLevel overrides jdkSourceLevel if both are set. Warning is also logged
      */
     @Test
     public void testBothjdkSourceLevelAndjavaSourceLevel() throws Exception {
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
index bbcb94c28608..277702840dfb 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava21Test.java
@@ -40,15 +40,12 @@
 /**
  * JSP 2.3 tests which use Java 21 specific features.
  *
- * Tests must only run when Java 21 is in use.
- *
- * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
+ * Tests must only run when Java 21 or later is in use.
  *
  */
-// No need to run against cdi-2.0 since these tests don't use CDI at all.
 @Mode(TestMode.FULL)
 @MinimumJavaLevel(javaLevel = 21)
-@SkipForRepeat("CDI-2.0")
+@SkipForRepeat("CDI-2.0") // No need to run against cdi-2.0 since these tests don't use CDI at all.
 @RunWith(FATRunner.class)
 public class JSPJava21Test {
     private static final String APP_NAME = "TestJSPWithJava21";
@@ -96,6 +93,14 @@ public void testJava21JSP() throws Exception {
         assertTrue("The response did not contain: success", response.getText().contains("switch success!"));
     }
 
+     /**
+     * Same test as testJava21JSP, but using the runtime JDK (via JSP's useJDKCompiler option rather than the default Eclipse Compiler for Java (ECJ))
+     *
+     * https://openliberty.io/docs/latest/reference/config/jspEngine.html
+     * 
+     * @throws Exception if something goes horribly wrong
+     *                
+     */
     @Test
     public void testJava21viaUseJDKCompiler() throws Exception {
 
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
index 51479e07a4e5..edce9f057aa7 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
+++ b/dev/com.ibm.ws.jsp.2.3_fat/fat/src/com/ibm/ws/jsp23/fat/tests/JSPJava8Test.java
@@ -36,7 +36,7 @@
 /**
  * JSP 2.3 tests which use Java 1.8 specific features.
  *
- * Tests must only run when Java 1.8 is in use.
+ * Tests must only run when Java 1.8 or later is in use.
  *
  * Tests that just need to drive a simple request using our WebBrowser object can be placed in this class.
  *
@@ -89,6 +89,14 @@ public void testJava8JSP() throws Exception {
         assertTrue("The response did not contain: onetwothreefour", response.getText().contains("onetwothreefour"));
     }
 
+    /**
+     * Same test as testJava8JSP, but using the runtime JDK (via JSP's useJDKCompiler option rather than the default Eclipse Compiler for Java (ECJ))
+     *
+     * https://openliberty.io/docs/latest/reference/config/jspEngine.html
+     * 
+     * @throws Exception if something goes horribly wrong
+     *                
+     */
     @Test
     public void testJava8viaUseJDKCompiler() throws Exception {
 
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
index 1df2a95eff71..60261fb0a132 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/bootstrap.properties
@@ -9,4 +9,3 @@
 ###############################################################################
 bootstrap.include=../testports.properties
 osgi.console=7777
-com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
index cc9226985ed8..9b51fb777a74 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava11Server/server.xml
@@ -16,7 +16,7 @@
         <feature>localConnector-1.0</feature>
     </featureManager>
 
-    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
 
     <jspEngine javaSourceLevel="11"/>
 
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
index 1df2a95eff71..60261fb0a132 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/bootstrap.properties
@@ -9,4 +9,3 @@
 ###############################################################################
 bootstrap.include=../testports.properties
 osgi.console=7777
-com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
index 7d65b5933efb..3d46d454d553 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava17Server/server.xml
@@ -16,10 +16,8 @@
         <feature>localConnector-1.0</feature>
     </featureManager>
 
-
-
-    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
-
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+    
     <jspEngine javaSourceLevel="17"/>
 
 </server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
index 1df2a95eff71..60261fb0a132 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/bootstrap.properties
@@ -9,4 +9,3 @@
 ###############################################################################
 bootstrap.include=../testports.properties
 osgi.console=7777
-com.ibm.ws.logging.trace.specification=*=info:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
index 49fd719e4ef5..97b8034b4d1e 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava21Server/server.xml
@@ -16,10 +16,8 @@
         <feature>localConnector-1.0</feature>
     </featureManager>
 
-
-
-    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
-
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+    
     <jspEngine javaSourceLevel="21"/>
 
 </server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
index 4cd37b71f284..aee1afa843dc 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/publish/servers/jspJava8Server/server.xml
@@ -1,5 +1,5 @@
 <!--
-    Copyright (c) 2015 IBM Corporation and others.
+    Copyright (c) 2015, 2023 IBM Corporation and others.
     All rights reserved. This program and the accompanying materials
     are made available under the terms of the Eclipse Public License 2.0
     which accompanies this distribution, and is available at
@@ -19,6 +19,6 @@
     <!-- Note: jdkSourceLevel has been marked internal -->
     <jspEngine jdkSourceLevel="18"/>
 
-    <logging traceSpecification="*=info=enabled:com.ibm.ws.webcontainer*=all:com.ibm.wsspi.webcontainer*=all:HTTPChannel=all:TCPChannel=all:GenericBNF=all:com.ibm.ws.jsp*=all" maxFileSize="20" maxFiles="10" traceFormat="BASIC"/>
-
+    <logging traceSpecification="*=info=enabled:com.ibm.ws.jsp*=all" maxFileSize="32" maxFiles="24" traceFormat="BASIC"/>
+    
 </server>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
deleted file mode 100644
index 75cec1550725..000000000000
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/META-INF/permissions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2023 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
- -->
-<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
-    version="7">
-
-   <permission>
-      <class-name>java.lang.RuntimePermission</class-name>
-      <name>getClassLoader</name>
-   </permission>
-
-</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
index 6c0fe3ace877..2fc1b54f8a2e 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava11.war/resources/WEB-INF/web.xml
@@ -14,6 +14,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
 
-  <display-name>TestJSPWithJava17</display-name>
+  <display-name>TestJSPWithJava11</display-name>
     
 </web-app>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
deleted file mode 100644
index 75cec1550725..000000000000
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava17.war/META-INF/permissions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2023 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
- -->
-<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
-    version="7">
-
-   <permission>
-      <class-name>java.lang.RuntimePermission</class-name>
-      <name>getClassLoader</name>
-   </permission>
-
-</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
deleted file mode 100644
index 75cec1550725..000000000000
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/META-INF/permissions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2023 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
- -->
-<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
-    version="7">
-
-   <permission>
-      <class-name>java.lang.RuntimePermission</class-name>
-      <name>getClassLoader</name>
-   </permission>
-
-</permissions>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
index 03ffcb61a702..368ca24bfeb4 100644
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
+++ b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava21.war/resources/index.jsp
@@ -33,5 +33,4 @@
        }
      %>
    </body>
- </html>
- 
\ No newline at end of file
+</html>
diff --git a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml b/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml
deleted file mode 100644
index 75cec1550725..000000000000
--- a/dev/com.ibm.ws.jsp.2.3_fat/test-applications/TestJSPWithJava8.war/META-INF/permissions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright (c) 2023 IBM Corporation and others.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License 2.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-2.0/
-    
-    SPDX-License-Identifier: EPL-2.0
- -->
-<permissions xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-        http://xmlns.jcp.org/xml/ns/javaee/permissions_7.xsd"
-    version="7">
-
-   <permission>
-      <class-name>java.lang.RuntimePermission</class-name>
-      <name>getClassLoader</name>
-   </permission>
-
-</permissions>
diff --git a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
index ecd50bd78e5d..830870ae9143 100644
--- a/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
+++ b/dev/com.ibm.ws.jsp/src/com/ibm/ws/jsp/translator/compiler/JDTCompiler.java
@@ -107,14 +107,14 @@ public JspCompilerResult compile(JspResources[] jspResources, JspResources[] dep
                 compilerOptionsMap.put(CompilerOptions.OPTION_LineNumberAttribute, CompilerOptions.GENERATE);
             compilerOptionsMap.put(CompilerOptions.OPTION_LocalVariableAttribute, CompilerOptions.GENERATE);
             compilerOptionsMap.put(CompilerOptions.OPTION_SourceFileAttribute, CompilerOptions.GENERATE);
-            compilerOptionsMap.put(CompilerOptions.OPTION_PreserveUnusedLocal, CompilerOptions.PRESERVE);            
+            compilerOptionsMap.put(CompilerOptions.OPTION_PreserveUnusedLocal, CompilerOptions.PRESERVE);
         }
         compilerOptionsMap.put(CompilerOptions.OPTION_Encoding, javaEncoding);
         
         if (javaSourceLevel != -1) {
             compilerOptionsMap.put(CompilerOptions.OPTION_Source, javaSourceLevel.toString());
-            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, javaSourceLevel.toString());  
-            compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, javaSourceLevel.toString());  
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, javaSourceLevel.toString());
+            compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, javaSourceLevel.toString());
         }
         else if (jdkSourceLevel == 14) {
             compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4);
@@ -128,20 +128,20 @@ else if (jdkSourceLevel == 15) {
         }
         //PM04610 start
         else if (jdkSourceLevel == 16) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); 
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6);
             compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_6);  // 341708        
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); // 412312
         }
         //PM04610 end
         else if (jdkSourceLevel == 17) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7); 
-            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7); 
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_7);
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7);
         }
         //126902 start
         else if (jdkSourceLevel == 18) {
-            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8); 
-            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8); 
+            compilerOptionsMap.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_8);
+            compilerOptionsMap.put(CompilerOptions.OPTION_Compliance, CompilerOptions.VERSION_1_8);
             compilerOptionsMap.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_8);
         }
         //126902 end

From 0672649e10269517a8440724996dec1e0ee8afcb Mon Sep 17 00:00:00 2001
From: Volodymyr Siedlecki <volosied@gmail.com>
Date: Fri, 5 Jan 2024 14:47:22 -0500
Subject: [PATCH 6/6] Correct message order

---
 .../com/ibm/ws/jsp/resources/messages.nlsprops    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
index 202b4d4e8789..a9958fe0a0d6 100644
--- a/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
+++ b/dev/com.ibm.ws.jsp/resources/com/ibm/ws/jsp/resources/messages.nlsprops
@@ -1274,19 +1274,18 @@ jsp.useinmemory.warning=CWWJS0004W: The 'useInMemory' JSP Option is not supporte
 jsp.useinmemory.warning.explanation=This feature was never ported from Traditional WebSphere for historical reasons.
 jsp.useinmemory.warning.useraction=Remove the useInMemory option from the server.xml, ibm-web-bnd.xml, or the ibm-web-ext.xmi files.
 
-jsp.javasourcelevel.warning=CWWJS0004W: The specified javaSourceLevel={0} value exceeds the {1} installed Java level. Therefore, the default Java level is set to {1}.
+pages.removed.element.error=CWWJS0005E: The {0} element was removed in Pages 4.0 and therefore is no longer supported.
+pages.removed.element.error.explanation=The jsp plugin and related actions were deprecated in Pages 3.1 and removed in 4.0. 
+pages.removed.element.error.useraction= Remove the jsp plugin, fallback, and params elements from your web app.
+
+jsp.javasourcelevel.warning=CWWJS0006W: The specified javaSourceLevel={0} value exceeds the {1} installed Java level. Therefore, the default Java level is set to {1}.
 jsp.javasourcelevel.warning.explanation=File cannot be compiled with a higher source than the available JDK level. 
 jsp.javasourcelevel.warning.useraction=Specify a javaSourceLevel value that is less than or equal to the available JDK level.
 
-jsp.bothsourcelevelset.warning=CWWJS0005W: Both javaSourceLevel={0} and jdkSourceLevel={1} are specified. Defaulting to javaSourceLevel={0}
+jsp.bothsourcelevelset.warning=CWWJS0007W: Both javaSourceLevel={0} and jdkSourceLevel={1} are specified. Defaulting to javaSourceLevel={0}
 jsp.bothsourcelevelset.warning.explanation= Only one source level attribute can be used at a time.
 jsp.bothsourcelevelset.warning.useraction= Specify only the javaSourceLevel attribute.  The jdkSourceLevel attribute is stabilized. 
 
-jsp.javasourcelevel.value=CWWJS0006I: The value of the JSP attribute javaSourceLevel is \"{0}\".
+jsp.javasourcelevel.value=CWWJS0008I: The value of the JSP attribute javaSourceLevel is \"{0}\".
 jsp.javasourcelevel.value.explanation =
 jsp.javasourcelevel.value.useraction =
-
-pages.removed.element.error=CWWJS0007E: The {0} element was removed in Pages 4.0 and therefore is no longer supported.
-pages.removed.element.error.explanation=The jsp plugin and related actions were deprecated in Pages 3.1 and removed in 4.0. 
-pages.removed.element.error.useraction= Remove the jsp plugin, fallback, and params elements from your web app.
-