You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2024/02/27 09:04:37 UTC
(tomcat) branch 8.5.x updated (4e288be9c9 -> 42440c8e69)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
from 4e288be9c9 Remove old javadoc
new 87e34bed3d Add support for JSP compilation with Java 22
new 42440c8e69 Add release date for 8.5.99
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++++++++++
webapps/docs/changelog.xml | 13 ++++++++++++-
2 files changed, 23 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 02/02: Add release date for 8.5.99
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 42440c8e69e127e7a17cfcc3922d1f8407d4f698
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 27 09:04:26 2024 +0000
Add release date for 8.5.99
---
webapps/docs/changelog.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 37737186fb..78cd4aa7ce 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,7 +127,7 @@
</changelog>
</subsection>
</section>
-<section name="Tomcat 8.5.99 (schultz)" rtext="release in progress">
+<section name="Tomcat 8.5.99 (schultz)" rtext="2024-02-19">
<subsection name="Catalina">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
(tomcat) 01/02: Add support for JSP compilation with Java 22
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 87e34bed3d21377bedf830d9d03f2ae44e0dcc2f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Feb 27 09:01:47 2024 +0000
Add support for JSP compilation with Java 22
---
java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++++++++++
webapps/docs/changelog.xml | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java b/java/org/apache/jasper/compiler/JDTCompiler.java
index 8ab753b541..487499b7ba 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -384,6 +384,11 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
// Java 7.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "21");
+ } else if (opt.equals("22")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7.
+ // This is checked against the actual version below.
+ settings.put(CompilerOptions.OPTION_Source, "22");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", opt));
settings.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_7);
@@ -493,6 +498,12 @@ public class JDTCompiler extends org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "21");
settings.put(CompilerOptions.OPTION_Compliance, "21");
+ } else if (opt.equals("22")) {
+ // Constant not available in latest ECJ version that runs on
+ // Java 7.
+ // This is checked against the actual version below.
+ settings.put(CompilerOptions.OPTION_TargetPlatform, "22");
+ settings.put(CompilerOptions.OPTION_Compliance, "22");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM", opt));
settings.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_7);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cfa29db518..37737186fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,17 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 8.5.100 (schultz)" rtext="in development">
+ <subsection name="Jasper">
+ <changelog>
+ <add>
+ Add support for specifying Java 22 (with the value <code>22</code>) as
+ the compiler source and/or compiler target for JSP compilation. If used
+ with an Eclipse JDT compiler version that does not support these values,
+ a warning will be logged and the default will used.
+ (markt)
+ </add>
+ </changelog>
+ </subsection>
<subsection name="Other">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org