Skip to content

Commit 3a6576e

Browse files
committed
LDEV-6110 add Lucee 7.1 builds with Java 25
LDEV-6110 add Lucee 7.1 builds with Java 25
1 parent 120b5de commit 3a6576e

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

download-latest-java-tomcat.cfm

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,11 @@
2525
java_version = 11;
2626
tomcat_win_exe = "tomcat9w.exe";
2727
28-
if ( version[ 1 ] gt 6 ||
29-
(version[ 1 ] gte 6 && version[ 2 ] gte 1 )){
28+
if ( version[ 1 ] gt 7 ||
29+
( version[ 1 ] gte 7 && version[ 2 ] gte 1 ) ){
30+
java_version = 25; // 7.1 onwards
31+
} else if ( version[ 1 ] gt 6 ||
32+
( version[ 1 ] gte 6 && version[ 2 ] gte 1 ) ){
3033
java_version = 21; // 6.1 onwards
3134
}
3235

lucee/lucee.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ Path: ${java_executable}
13751375
<labelParameter>
13761376
<name>NoSystemJavadetected</name>
13771377
<title>No System Java detected</title>
1378-
<description>Lucee requires a Java runtime (Version 11 supported, Lucee 6.1+ supports Java 21 )</description>
1378+
<description>Lucee requires a Java runtime (Version 11 supported, Lucee 6.1+ supports Java 21, Lucee 7.1+ supports Java 25 )</description>
13791379
<explanation>The bundled JRE will be automatically installed</explanation>
13801380
<image></image>
13811381
<ruleList>

0 commit comments

Comments
 (0)