use jakarta servlet instead of javax

lucee · Dec 5, 2024 · aa153f7 · aa153f7
1 parent a4521bf
commit aa153f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/download-latest-java-tomcat.cfm b/download-latest-java-tomcat.cfm
@@ -63,6 +63,8 @@
 		web_xml = "lucee/tomcat9/tomcat-lucee-conf/conf/web.xml";
 		template = fileRead(web_xml);
 		template = Replace( template, tomcat_9_web_xml_header, tomcat_web_xml_header );
+		template = Replace( template, ">lucee.loader.servlet.", ">lucee.loader.servlet.jakarta." );
+		
 		fileWrite( web_xml, template );
 	}
 

diff --git a/lucee/lucee.xml.template b/lucee/lucee.xml.template
@@ -1164,8 +1164,8 @@ Please review ${installer_installation_log}.</text>
             <validVersionList>
                 <validVersion>
                     <bitness>64</bitness>
-                    <maxVersion>14</maxVersion>
-                    <minVersion>1.8</minVersion>
+                    <maxVersion>21</maxVersion>
+                    <minVersion>11</minVersion>
                     <requireJDK>0</requireJDK>
                     <vendor></vendor>
                 </validVersion>
@@ -1380,7 +1380,7 @@ Path: ${java_executable}
         <labelParameter>
             <name>NoSystemJavadetected</name>
             <title>No System Java detected</title>
-            <description>Lucee requires a Java runtime (versions 1.8 to 14 are supported)</description>
+            <description>Lucee requires a Java runtime (Version 11 supported, Lucee 6.1+ supports Java 21 )</description>
             <explanation>The bundled JRE will be automatically installed</explanation>
             <image></image>
             <ruleList>