Re: sources repository for taglibs-standard-impl/specs-1.2.5-migrated-0.0.1
On Fri, 27 Mar 2020 at 20:01, Mark Thomas wrote: > On 27/03/2020 04:58, Olivier Lamy wrote: > > Hi > > We have to move this https://svn.apache.org/repos/asf/tomcat/taglibs/ > > to git. > > As it's few separate Maven projects, maybe we could create one git repo > > per project: > > - https://github.com/apache/tomcat-taglibs-site > > - https://github.com/apache/tomcat-taglibs-standard (standard-examples > > can be integrated in standard source tree but not part of the release > > just here for documentation purpose) > > - https://github.com/apache/tomcat-taglibs-parent > > > > - https://github.com/apache/tomcat-taglibs can contain some modules to > > ease clone of only git repo (or maybe we simply put the site here) I > > don't have strong opinion for this > > > > Do we still need rdc? > > The above seems reasonable to me but I have never worked on taglibs so > my opinion shouldn't count for much. > > > during the migration each tags/branches (if any) will be integrated in > > the created git repo > > This is the bit that interests me. I know from experience with previous > Tomcat projects that the svn -> git migration for a project that has > previously gone through an cvs -> svn migration is very slow. It took > over a week to process the Tomcat Connectors project. This is because > the migration tool ends up searching back through the history repeatedly > for each tag. > > I might be able to help put by running the migration directly on one of > the ASF servers. I'll need to talk to infra if we want to try that route. > Great. Let me know if you need any help? > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy http://twitter.com/olamy | http://linkedin.com/in/olamy
[tomcat] branch master updated: BZ 64272. Update WebSocket spec reference and source code links.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 1a429a3 BZ 64272. Update WebSocket spec reference and source code links. 1a429a3 is described below commit 1a429a3cc5fbf3d931e73734274e028cb8742cae Author: Mark Thomas AuthorDate: Sat Mar 28 13:16:10 2020 + BZ 64272. Update WebSocket spec reference and source code links. --- webapps/docs/web-socket-howto.xml | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml index 6729d90..078ed34 100644 --- a/webapps/docs/web-socket-howto.xml +++ b/webapps/docs/web-socket-howto.xml @@ -38,14 +38,15 @@ -Tomcat implements the Java WebSocket 1.1 API defined by https://www.jcp.org/en/jsr/detail?id=356";>JSR-356. +Tomcat implements the Jakarta WebSocket 2.0 API defined by the https://projects.eclipse.org/projects/ee4j.websocket";>Jakarta + WebSocket project. There are several example applications that demonstrate how the WebSocket API can be used. You will need to look at both the client side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";> + href="https://github.com/apache/tomcat/tree/master/webapps/examples/websocket";> HTML and the server side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";> + href="https://github.com/apache/tomcat/tree/master/webapps/examples/WEB-INF/classes/websocket";> code. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: BZ 64272. Update WebSocket source code links.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/9.0.x by this push: new ae38f23 BZ 64272. Update WebSocket source code links. ae38f23 is described below commit ae38f238f7faa558cbf0b0ebda6937a1be6a32ec Author: Mark Thomas AuthorDate: Sat Mar 28 13:18:04 2020 + BZ 64272. Update WebSocket source code links. https://bz.apache.org/bugzilla/show_bug.cgi?id=64272 --- webapps/docs/web-socket-howto.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml index 69b8baf..e196cb4 100644 --- a/webapps/docs/web-socket-howto.xml +++ b/webapps/docs/web-socket-howto.xml @@ -43,9 +43,9 @@ There are several example applications that demonstrate how the WebSocket API can be used. You will need to look at both the client side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";> + href="https://github.com/apache/tomcat/tree/9.0.x/webapps/examples/websocket";> HTML and the server side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";> + href="https://github.com/apache/tomcat/tree/9.0.x/webapps/examples/WEB-INF/classes/websocket";> code. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: BZ 64272. Update WebSocket source code links.
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 The following commit(s) were added to refs/heads/8.5.x by this push: new 38449c1 BZ 64272. Update WebSocket source code links. 38449c1 is described below commit 38449c1153df06ca3cad195931d0a6700e89529b Author: Mark Thomas AuthorDate: Sat Mar 28 13:19:18 2020 + BZ 64272. Update WebSocket source code links. https://bz.apache.org/bugzilla/show_bug.cgi?id=64272 --- webapps/docs/web-socket-howto.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml index 69b8baf..143c699 100644 --- a/webapps/docs/web-socket-howto.xml +++ b/webapps/docs/web-socket-howto.xml @@ -43,9 +43,9 @@ There are several example applications that demonstrate how the WebSocket API can be used. You will need to look at both the client side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/websocket/";> + href="https://github.com/apache/tomcat/tree/8.5.x/webapps/examples/websocket";> HTML and the server side https://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/websocket/";> + href="https://github.com/apache/tomcat/tree/8.5.x/webapps/examples/WEB-INF/classes/websocket";> code. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 64272] Broken links on the WebSocket How-To page
https://bz.apache.org/bugzilla/show_bug.cgi?id=64272 Mark Thomas changed: What|Removed |Added OS||All Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #1 from Mark Thomas --- Fixed in: - master for 10.0.0-M4 onwards - 9.0.x for 9.0.34 onwards - 8.5.x for 8.5.54 onwards - 7.0.x for 7.0.104 onwards -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: BZ 64272. Update WebSocket source code links.
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 6ac884b BZ 64272. Update WebSocket source code links. 6ac884b is described below commit 6ac884b5f8b3d47d65c8479ebbde7baa3a732268 Author: Mark Thomas AuthorDate: Sat Mar 28 13:20:26 2020 + BZ 64272. Update WebSocket source code links. https://bz.apache.org/bugzilla/show_bug.cgi?id=64272 --- webapps/docs/web-socket-howto.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapps/docs/web-socket-howto.xml b/webapps/docs/web-socket-howto.xml index e5865cd..de48eb7 100644 --- a/webapps/docs/web-socket-howto.xml +++ b/webapps/docs/web-socket-howto.xml @@ -43,9 +43,9 @@ There are several example applications that demonstrate how the WebSocket API can be used. You will need to look at both the client side https://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/websocket/";> + href="https://github.com/apache/tomcat/tree/7.0.x/webapps/examples/websocket";> HTML and the server side https://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/";> + href="https://github.com/apache/tomcat/tree/7.0.x/webapps/examples/WEB-INF/classes/websocket";> code. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update to the Eclipse JDT compiler 4.15
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 299768b Update to the Eclipse JDT compiler 4.15
299768b is described below
commit 299768bddd8fe4b4ad935296267a0e974225afc2
Author: Mark Thomas
AuthorDate: Sat Mar 28 14:48:51 2020 +
Update to the Eclipse JDT compiler 4.15
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 7 +++
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index f6651d2..33b1fbe 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -130,14 +130,14 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
# Checksum is from "SHA512 Checksums for 4.13" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/checksum/eclipse-4.13-SUMSSHA512
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/checksum/eclipse-4.15-SUMSSHA512
#
-jdt.version=4.13
-jdt.release=R-4.13-201909161045/
+jdt.version=4.15
+jdt.release=R-4.15-202003050155/
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=d608e4b7fc9b061e327ad5c39112c032e310a48c57ddd01c9349f2be8f5ce4d3d0c3862b6b5cc105220a06a6dd62c477de654b9fbe6f4c8a3d3de816e5de19f7
+jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8c4b43c..eb6caab 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -143,6 +143,13 @@
+
+
+
+Update to the Eclipse JDT compiler 4.15. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Update Maven dependency for ECJ
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/master by this push: new 3e773fb Update Maven dependency for ECJ 3e773fb is described below commit 3e773fb9104dab51d36aa488dd223d20a38239c7 Author: Mark Thomas AuthorDate: Sat Mar 28 14:54:18 2020 + Update Maven dependency for ECJ --- res/maven/tomcat-jasper.pom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom index d6bf9579..991e48d 100644 --- a/res/maven/tomcat-jasper.pom +++ b/res/maven/tomcat-jasper.pom @@ -60,7 +60,7 @@ org.eclipse.jdt ecj - 3.18.0 + 3.21.0 org.apache.tomcat - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update to the Eclipse JDT compiler 4.15
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 44eb6c4 Update to the Eclipse JDT compiler 4.15
44eb6c4 is described below
commit 44eb6c43f225d9665288c010c2254040af16d350
Author: Mark Thomas
AuthorDate: Sat Mar 28 14:52:21 2020 +
Update to the Eclipse JDT compiler 4.15
---
build.properties.default| 10 +-
res/maven/tomcat-jasper.pom | 2 +-
webapps/docs/changelog.xml | 7 +++
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 56ba7fc..7d2404e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -130,14 +130,14 @@
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
# See
https://cwiki.apache.org/confluence/display/TOMCAT/Managing+Tomcat%27s+Dependency+on+the+Eclipse+JDT+Core+Batch+Compiler
#
# Checksum is from "SHA512 Checksums for 4.13" link at
-# http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/
-#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.13-201909161045/checksum/eclipse-4.13-SUMSSHA512
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/
+#
http://download.eclipse.org/eclipse/downloads/drops4/R-4.15-202003050155/checksum/eclipse-4.15-SUMSSHA512
#
-jdt.version=4.13
-jdt.release=R-4.13-201909161045/
+jdt.version=4.15
+jdt.release=R-4.15-202003050155/
jdt.checksum.enabled=true
jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=d608e4b7fc9b061e327ad5c39112c032e310a48c57ddd01c9349f2be8f5ce4d3d0c3862b6b5cc105220a06a6dd62c477de654b9fbe6f4c8a3d3de816e5de19f7
+jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
jdt.home=${base.path}/ecj-${jdt.version}
jdt.jar=${jdt.home}/ecj-${jdt.version}.jar
# The download will be moved to the archive area eventually. We are taking
care of that in advance.
diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index d6bf9579..991e48d 100644
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -60,7 +60,7 @@
org.eclipse.jdt
ecj
- 3.18.0
+ 3.21.0
org.apache.tomcat
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 31df791..10c2c7f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -90,6 +90,13 @@
+
+
+
+Update to the Eclipse JDT compiler 4.15. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add Java 14 and 15 support to JSP compilation when supported by the ECJ
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 1b41fc7 Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
1b41fc7 is described below
commit 1b41fc7ad0ec4fde8c31ea1f14a55b067e306144
Author: Mark Thomas
AuthorDate: Sat Mar 28 15:01:34 2020 +
Add Java 14 and 15 support to JSP compilation when supported by the ECJ
---
java/org/apache/jasper/compiler/JDTCompiler.java | 22 ++
webapps/docs/changelog.xml | 7 +++
2 files changed, 29 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 9b0e0fe..85b693b 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -332,6 +332,16 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
@@ -406,6 +416,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
settings.put(CompilerOptions.OPTION_Compliance, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
+settings.put(CompilerOptions.OPTION_Compliance, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
+settings.put(CompilerOptions.OPTION_Compliance, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index eb6caab..fda7893 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -148,6 +148,13 @@
Update to the Eclipse JDT compiler 4.15. (markt)
+
+Add support for specifying Java 14 (with the value 14) and
+Java 15 (with the value 15) as the compiler source and/or
+compiler target for JSP compilation. If used with an ECJ version that
+does not support these values, a warning will be logged and the latest
+supported version will used. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Add Java 14 and 15 support to JSP compilation when supported by the ECJ
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 708c7f6 Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
708c7f6 is described below
commit 708c7f6a52817b446b9533c58cb78772485ac389
Author: Mark Thomas
AuthorDate: Sat Mar 28 15:01:34 2020 +
Add Java 14 and 15 support to JSP compilation when supported by the ECJ
---
java/org/apache/jasper/compiler/JDTCompiler.java | 22 ++
webapps/docs/changelog.xml | 7 +++
2 files changed, 29 insertions(+)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 9b0e0fe..85b693b 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -332,6 +332,16 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// Tomcat. May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
@@ -406,6 +416,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
settings.put(CompilerOptions.OPTION_Compliance, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
+settings.put(CompilerOptions.OPTION_Compliance, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
+settings.put(CompilerOptions.OPTION_Compliance, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 10c2c7f..f3778d8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -95,6 +95,13 @@
Update to the Eclipse JDT compiler 4.15. (markt)
+
+Add support for specifying Java 14 (with the value 14) and
+Java 15 (with the value 15) as the compiler source and/or
+compiler target for JSP compilation. If used with an ECJ version that
+does not support these values, a warning will be logged and the latest
+supported version will used. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Add Java 14 and 15 support to JSP compilation when supported by the ECJ
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 388fefa Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
388fefa is described below
commit 388fefa9e24e7de7c4b30b98df83f4283b4cb85d
Author: Mark Thomas
AuthorDate: Sat Mar 28 15:01:34 2020 +
Add Java 14 and 15 support to JSP compilation when supported by the ECJ
Also update comments about latest Java version supported by newer ECJ
releases.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 26 ++--
webapps/docs/changelog.xml | 11 ++
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 1d0f0b7..ec347d8 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -355,8 +355,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "11");
} else if(opt.equals("12")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// 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, "12");
} else if(opt.equals("13")) {
@@ -364,6 +364,16 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest available ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest available ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
@@ -439,6 +449,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
settings.put(CompilerOptions.OPTION_Compliance, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
+settings.put(CompilerOptions.OPTION_Compliance, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
+settings.put(CompilerOptions.OPTION_Compliance, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 567be56..a0d7263 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -86,6 +86,17 @@
+
+
+
+Add support for specifying Java 14 (with the value 14) and
+Java 15 (with the value 15) as the compiler source and/or
+compiler target for JSP compilation. If used with an ECJ version that
+does not support these values, a warning will be logged and the latest
+supported version will used. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 7.0.x updated: Add Java 14 and 15 support to JSP compilation when supported by the ECJ
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new bfea53d Add Java 14 and 15 support to JSP compilation when supported
by the ECJ
bfea53d is described below
commit bfea53dae62342f5aa984b15d916221def179836
Author: Mark Thomas
AuthorDate: Sat Mar 28 15:01:34 2020 +
Add Java 14 and 15 support to JSP compilation when supported by the ECJ
Also update comments about latest Java version supported by newer ECJ
releases.
---
java/org/apache/jasper/compiler/JDTCompiler.java | 30
webapps/docs/changelog.xml | 11 +
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 91de3dc..bec0887 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -386,8 +386,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "11");
} else if(opt.equals("12")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 6.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "12");
} else if(opt.equals("13")) {
@@ -395,6 +395,16 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// May be supported in a snapshot build.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_Source, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest available ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest available ECJ version.
+// May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_Source, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM",
opt));
settings.put(CompilerOptions.OPTION_Source,
@@ -459,8 +469,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "11");
settings.put(CompilerOptions.OPTION_Compliance, "11");
} else if(opt.equals("12")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// Constant not available in latest ECJ version that runs on
+// Java 6.
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "12");
settings.put(CompilerOptions.OPTION_Compliance, "12");
@@ -470,6 +480,18 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
// This is checked against the actual version below.
settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
settings.put(CompilerOptions.OPTION_Compliance, "13");
+} else if(opt.equals("14")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
+settings.put(CompilerOptions.OPTION_Compliance, "14");
+} else if(opt.equals("15")) {
+// Constant not available in latest ECJ version shipped with
+// Tomcat. May be supported in a snapshot build.
+// This is checked against the actual version below.
+settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
+settings.put(CompilerOptions.OPTION_Compliance, "15");
} else {
log.warn(Localizer.getMessage("jsp.warning.unknown.targetVM",
opt));
settings.put(CompilerOptions.OPTION_TargetPlatform,
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 50921c
[tomcat] branch 8.5.x updated: Update comment for Target JRE as well
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
The following commit(s) were added to refs/heads/8.5.x by this push:
new 86f8d8c Update comment for Target JRE as well
86f8d8c is described below
commit 86f8d8c1f4aec1b44e2e5cbbe4ce8886a4d7b97e
Author: Mark Thomas
AuthorDate: Sat Mar 28 15:12:20 2020 +
Update comment for Target JRE as well
---
java/org/apache/jasper/compiler/JDTCompiler.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java
b/java/org/apache/jasper/compiler/JDTCompiler.java
index ec347d8..5daea81 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -438,8 +438,8 @@ public class JDTCompiler extends
org.apache.jasper.compiler.Compiler {
settings.put(CompilerOptions.OPTION_TargetPlatform, "11");
settings.put(CompilerOptions.OPTION_Compliance, "11");
} else if(opt.equals("12")) {
-// Constant not available in latest available ECJ version.
-// May be supported in a snapshot build.
+// 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, "12");
settings.put(CompilerOptions.OPTION_Compliance, "12");
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1648 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] bfea53dae62342f5aa984b15d916221def179836 Blamelist: Mark Thomas BUILD FAILED: failed compile_1 Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
