date:20201026

Re: svn/git for website

2020-10-26 Thread Konstantin Kolinko

пт, 2 окт. 2020 г. в 00:09, Mark Thomas :
>
> Hi all,
>
> The topic came up at the BoF session at the end of the Tomcat track of
> migrating the website from svn to git. There were strong opinions both
> for migrating and for sticking with svn.
>
> As a middle ground I'd like to propose we ask Infra to create a git
> mirror of the svn repo.
>
> For those who favour git:
> The git mirror would be read-only but it would be possible to:
> - clone the git mirror
> - make changes in git
> - use git-svn to commit those changes back to svn
> - then the mirror automatically replicates them back to git
>
> For those who favour svn there would be no change.
>
> If there is agreement on this approach, I volunteer to contact infra to
> get it set up.

My proposal at BoF was for a partial mirror.

The issue is that

1. I think that this mirror is intended as a tool to collect feedback
/ patches from random people, and to lower barriers for contribution.

2. The full Tomcat site is large. It includes documentation for all
versions of Tomcat, including javadocs. Those pages are changed rarely
and are not needed for people who contribute small changes for the
site. The source code for those pages is elsewhere.

3. Subversion has easy commands to cope with such large source trees.
This feature is called "sparse checkouts".

For our site the necessary commands are documented in README.txt.
Essentially, it is done with --depth and --set-depth arguments to "svn
checkout" and "svn update" commands

Speaking about Git, there are huge repositories [1] out there, but I
think that the majority of people are not accustomed to them.

[1] https://en.wikipedia.org/wiki/Monorepo

I see that Git developers recently did some work to make dealing with
such repositories simpler, with addition of "git sparse-checkout"
command in Git 2.25.0 [2], released in January 2020.

[2] https://github.com/git/git/blob/v2.25.0/Documentation/RelNotes/2.25.0.txt

Though I think that support in tools is still lacking. E.g. missing in
TortoiseGit. [3]

[3] https://gitlab.com/tortoisegit/tortoisegit/issues/1599


If we go with a full Git mirror or with migration to Git, then I think
that somebody has to prepare an update to README.txt.

If we go with a partial Git mirror, I think it could be named
"tomcat-site-dev", reserving the name "tomcat-site" for a full mirror
if we ever make one.


Ignored paths for git-svn are configured with "--ignore-paths"
argument or with "svn-remote..ignore-paths" configuration
option. [4]

[4] https://git-scm.com/docs/git-svn


Other notes:

4. Release managers use Subversion to publish the binaries.

Thus I expect that they are able to update the published documentation
with Subversion as well.

5. Publishing the javadocs generates small changes over a large number
of files. The script that generates the commit email notes that the
diff is huge and trims it all to a small summary.

If we ever migrate to Git, I wonder whether a similar script in Git is
able to cope with it.


Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit 228aecb5bfe788ee618ace0b9ea3b3f4563a4f28
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit 517f6689f6d9be236aa8234c3edf190030529f70
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c296cf..1b45cd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit 8b32a1cd204c7ded19a9d514b4b1f13de6cce1c0
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 32040e0b6265ced5fed1b23810707172243bafbb
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 7f3012d..a2bbd1e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit e6da7d1b1766fdda68347f5291794b193eecc600
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c9e6713..def7752 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] branch 9.0.x updated (8756ed7 -> 8b32a1c)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8756ed7  Code cleanup
 new 32040e0  Add support for specifying Java 16 with the JDT compiler
 new e6da7d1  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new 228aecb  Use constants for Java 13 and Java 14 that are now available
 new 8b32a1c  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 7b51c5d69fecdf90939b7adad30615aa913575c1
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 706c8ee..510f851 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit cc0dfd42bc61bee15cc0d7179f271889ad7bf324
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (c4787f4 -> cc0dfd4)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c4787f4  Code cleanup
 new 7b51c5d  Add support for specifying Java 16 with the JDT compiler
 new 517f668  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new a481122  Use constants for Java 13 and Java 14 that are now available
 new cc0dfd4  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
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 (8756ed7 -> 8b32a1c)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8756ed7  Code cleanup
 new 32040e0  Add support for specifying Java 16 with the JDT compiler
 new e6da7d1  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new 228aecb  Use constants for Java 13 and Java 14 that are now available
 new 8b32a1c  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 32040e0b6265ced5fed1b23810707172243bafbb
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 7f3012d..a2bbd1e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit e6da7d1b1766fdda68347f5291794b193eecc600
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c9e6713..def7752 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit 228aecb5bfe788ee618ace0b9ea3b3f4563a4f28
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit 8b32a1cd204c7ded19a9d514b4b1f13de6cce1c0
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 7b51c5d69fecdf90939b7adad30615aa913575c1
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 706c8ee..510f851 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit cc0dfd42bc61bee15cc0d7179f271889ad7bf324
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (c4787f4 -> cc0dfd4)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c4787f4  Code cleanup
 new 7b51c5d  Add support for specifying Java 16 with the JDT compiler
 new 517f668  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new a481122  Use constants for Java 13 and Java 14 that are now available
 new cc0dfd4  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit 517f6689f6d9be236aa8234c3edf190030529f70
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c296cf..1b45cd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit 228aecb5bfe788ee618ace0b9ea3b3f4563a4f28
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
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 (8756ed7 -> 8b32a1c)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8756ed7  Code cleanup
 new 32040e0  Add support for specifying Java 16 with the JDT compiler
 new e6da7d1  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new 228aecb  Use constants for Java 13 and Java 14 that are now available
 new 8b32a1c  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit 517f6689f6d9be236aa8234c3edf190030529f70
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c296cf..1b45cd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit e6da7d1b1766fdda68347f5291794b193eecc600
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c9e6713..def7752 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 7b51c5d69fecdf90939b7adad30615aa913575c1
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 706c8ee..510f851 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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 master updated (c4787f4 -> cc0dfd4)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c4787f4  Code cleanup
 new 7b51c5d  Add support for specifying Java 16 with the JDT compiler
 new 517f668  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new a481122  Use constants for Java 13 and Java 14 that are now available
 new cc0dfd4  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit cc0dfd42bc61bee15cc0d7179f271889ad7bf324
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] branch 9.0.x updated (8756ed7 -> 8b32a1c)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8756ed7  Code cleanup
 new 32040e0  Add support for specifying Java 16 with the JDT compiler
 new e6da7d1  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new 228aecb  Use constants for Java 13 and Java 14 that are now available
 new 8b32a1c  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 32040e0b6265ced5fed1b23810707172243bafbb
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 7f3012d..a2bbd1e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit 8b32a1cd204c7ded19a9d514b4b1f13de6cce1c0
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 7b51c5d69fecdf90939b7adad30615aa913575c1
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 706c8ee..510f851 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit 517f6689f6d9be236aa8234c3edf190030529f70
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c296cf..1b45cd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit 8b32a1cd204c7ded19a9d514b4b1f13de6cce1c0
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 32040e0b6265ced5fed1b23810707172243bafbb
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 7f3012d..a2bbd1e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit e6da7d1b1766fdda68347f5291794b193eecc600
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c9e6713..def7752 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit 228aecb5bfe788ee618ace0b9ea3b3f4563a4f28
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (c4787f4 -> cc0dfd4)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c4787f4  Code cleanup
 new 7b51c5d  Add support for specifying Java 16 with the JDT compiler
 new 517f668  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new a481122  Use constants for Java 13 and Java 14 that are now available
 new cc0dfd4  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit cc0dfd42bc61bee15cc0d7179f271889ad7bf324
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64850] Add support to tomcat for JEP380: Unix domain sockets

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64850

Michael Osipov  changed:

   What|Removed |Added

 OS||All

--- Comment #1 from Michael Osipov  ---
This could have happened years ago with
https://github.com/kohlschutter/junixsocket. Do you plan to use with mod_proxy
UDS support?

-- 
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] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 7b51c5d69fecdf90939b7adad30615aa913575c1
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 706c8ee..510f851 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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 (8756ed7 -> 8b32a1c)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 8756ed7  Code cleanup
 new 32040e0  Add support for specifying Java 16 with the JDT compiler
 new e6da7d1  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new 228aecb  Use constants for Java 13 and Java 14 that are now available
 new 8b32a1c  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit 8b32a1cd204c7ded19a9d514b4b1f13de6cce1c0
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit e6da7d1b1766fdda68347f5291794b193eecc600
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c9e6713..def7752 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[tomcat] branch master updated (c4787f4 -> cc0dfd4)

2020-10-26 Thread markt

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from c4787f4  Code cleanup
 new 7b51c5d  Add support for specifying Java 16 with the JDT compiler
 new 517f668  Update JDT to 4.17 / 3.23.0 (same JAR - different numbering 
schemes)
 new a481122  Use constants for Java 13 and Java 14 that are now available
 new cc0dfd4  Make formatting consistent

The 4 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:
 build.properties.default   |  12 +-
 java/org/apache/jasper/compiler/JDTCompiler.java   | 147 -
 res/ide-support/eclipse/eclipse.classpath  |   2 +-
 res/ide-support/idea/tomcat.iml|   2 +-
 .../netbeans/nb-tomcat-build.properties|   2 +-
 res/ide-support/netbeans/project.xml   |   2 +-
 res/maven/tomcat-jasper.pom|   2 +-
 webapps/docs/changelog.xml |   9 ++
 8 files changed, 74 insertions(+), 104 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/04: Add support for specifying Java 16 with the JDT compiler

2020-10-26 Thread markt

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

commit 32040e0b6265ced5fed1b23810707172243bafbb
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:25:05 2020 +

Add support for specifying Java 16 with the JDT compiler
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 11 +++
 webapps/docs/changelog.xml   |  6 ++
 2 files changed, 17 insertions(+)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index bcb9f84..a5a5806 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -331,6 +331,11 @@ 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, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
 settings.put(CompilerOptions.OPTION_Source,
@@ -417,6 +422,12 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 // This is checked against the actual version below.
 settings.put(CompilerOptions.OPTION_TargetPlatform, "15");
 settings.put(CompilerOptions.OPTION_Compliance, "15");
+} else if(opt.equals("16")) {
+// 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, "16");
+settings.put(CompilerOptions.OPTION_Compliance, "16");
 } 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 7f3012d..a2bbd1e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -121,6 +121,12 @@
 64794: Security exception reading system property on
 JspRuntimeLibrary use. (remm)
   
+  
+Add support for specifying Java 16 (with the value 16) 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] 03/04: Use constants for Java 13 and Java 14 that are now available

2020-10-26 Thread markt

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

commit 228aecb5bfe788ee618ace0b9ea3b3f4563a4f28
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:31:33 2020 +

Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++--
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source,
  CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Compliance,
 CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
-// 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, "13");
-settings.put(CompilerOptions.OPTION_Compliance, "13");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_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");
+settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
 } else if(opt.equals("15")) {
 // Constant not available in latest ECJ version shipped with
 // Tomcat. May be supported in a snapshot build.


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 04/04: Make formatting consistent

2020-10-26 Thread markt

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

commit cc0dfd42bc61bee15cc0d7179f271889ad7bf324
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:33:24 2020 +

Make formatting consistent
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 114 ---
 1 file changed, 38 insertions(+), 76 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index 3377112..4722a4a 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -279,43 +279,31 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 if(ctxt.getOptions().getCompilerSourceVM() != null) {
 String opt = ctxt.getOptions().getCompilerSourceVM();
 if(opt.equals("1.1")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_1);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_1);
 } else if(opt.equals("1.2")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_2);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_2);
 } else if(opt.equals("1.3")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_3);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_3);
 } else if(opt.equals("1.4")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_4);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_4);
 } else if(opt.equals("1.5")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_5);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_5);
 } else if(opt.equals("1.6")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_6);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_6);
 } else if(opt.equals("1.7")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_7);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_7);
 } else if(opt.equals("1.8")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 // Version format changed from Java 9 onwards.
 // Support old format that was used in EA implementation as well
 } else if(opt.equals("9") || opt.equals("1.9")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_9);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_9);
 } else if(opt.equals("10")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_10);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_10);
 } else if(opt.equals("11")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_11);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_11);
 } else if(opt.equals("12")) {
-settings.put(CompilerOptions.OPTION_Source,
- CompilerOptions.VERSION_12);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_12);
 } else if(opt.equals("13")) {
 settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
 } else if(opt.equals("14")) {
@@ -332,72 +320,50 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
 settings.put(CompilerOptions.OPTION_Source, "16");
 } else {
 log.warn(Localizer.getMessage("jsp.warning.unknown.sourceVM", 
opt));
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_1_8);
 }
 } else {
 // Default to 1.8
-settings.put(CompilerOptions.OPTION_Source,
-CompilerOptions.VERSION_1_8);
+

[tomcat] 02/04: Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)

2020-10-26 Thread markt

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

commit 517f6689f6d9be236aa8234c3edf190030529f70
Author: Mark Thomas 
AuthorDate: Mon Oct 26 19:29:50 2020 +

Update JDT to 4.17 / 3.23.0 (same JAR - different numbering schemes)
---
 build.properties.default| 12 ++--
 res/ide-support/eclipse/eclipse.classpath   |  2 +-
 res/ide-support/idea/tomcat.iml |  2 +-
 res/ide-support/netbeans/nb-tomcat-build.properties |  2 +-
 res/ide-support/netbeans/project.xml|  2 +-
 res/maven/tomcat-jasper.pom |  2 +-
 webapps/docs/changelog.xml  |  3 +++
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3c296cf..1b45cd5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -129,15 +129,15 @@ 
wsdl4j-lib.loc=${base-maven.loc}/wsdl4j/wsdl4j/${wsdl4j-lib.version}/wsdl4j-${ws
 # - Eclipse JDT, version 4.7 or later -#
 # 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.15" link at
-# 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
+# Checksum is from "SHA512 Checksums for 4.17" link at
+# http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/
+# 
http://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/checksum/eclipse-4.17-SUMSSHA512
 #
-jdt.version=4.15
-jdt.release=R-4.15-202003050155/
+jdt.version=4.17
+jdt.release=R-4.17-202009021800
 jdt.checksum.enabled=true
 jdt.checksum.algorithm=SHA-512
-jdt.checksum.value=41311832a593d13ea84eebea087baa3bab16df381c70bd4c0f425caeb69eac1b41be2af27e40735ae16c039df4861fa93c3cfc4c21f84bad1c5eb1cb0e7ad351
+jdt.checksum.value=5e63e06eccd76a61249c7c6bd97e5b77dc37335bfdf316d941b00a16bae4f152d4306bac4e45c8422976187b0d77fe30cf7e6f6d4425f7732a3cb0cfa954385b
 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/ide-support/eclipse/eclipse.classpath 
b/res/ide-support/eclipse/eclipse.classpath
index 73e459e..5b34ea5 100644
--- a/res/ide-support/eclipse/eclipse.classpath
+++ b/res/ide-support/eclipse/eclipse.classpath
@@ -24,7 +24,7 @@
 
 
 
-
+
 
 
 
diff --git a/res/ide-support/idea/tomcat.iml b/res/ide-support/idea/tomcat.iml
index 22834db..268961a 100644
--- a/res/ide-support/idea/tomcat.iml
+++ b/res/ide-support/idea/tomcat.iml
@@ -68,7 +68,7 @@
 
   
 
-  
+  
 
 
 
diff --git a/res/ide-support/netbeans/nb-tomcat-build.properties 
b/res/ide-support/netbeans/nb-tomcat-build.properties
index bc3ff92..3400b83 100644
--- a/res/ide-support/netbeans/nb-tomcat-build.properties
+++ b/res/ide-support/netbeans/nb-tomcat-build.properties
@@ -37,7 +37,7 @@ nb-test.io-method=org.apache.coyote.http11.Http11NioProtocol
 # it is not possible to retrieve the classpaths from the build to
 # use in the NetBeans targets, so they must be explicitly declared
 
-nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${tomcat.classes}
+nb-test.classpath=${test.classes}:${tomcat.build}/webapps/examples/WEB-INF/classes:${base.path}/junit-4.13/junit-4.13.jar:${base.path}/easymock-4.2/easymock-4.2.jar:${base.path}/objenesis-3.1/objenesis-3.1.jar:${base.path}/cglib-3.3.0/cglib-nodep-3.3.0.jar:${base.path}/hamcrest-2.2/hamcrest-2.2.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${tomcat.classes}
 
 # Extra properties used by the Tomcat project additional NetBeans targets.
 
diff --git a/res/ide-support/netbeans/project.xml 
b/res/ide-support/netbeans/project.xml
index a78164c..0dd6468 100644
--- a/res/ide-support/netbeans/project.xml
+++ b/res/ide-support/netbeans/project.xml
@@ -178,7 +178,7 @@
 -->
 
 java
-${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.15/ecj-4.15.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/
+${base.path}/jaxrpc-1.1-rc4/geronimo-spec-jaxrpc-1.1-rc4.jar:${base.path}/wsdl4j-1.6.3/wsdl4j-1.6.3.jar:${base.path}/ecj-4.17/ecj-4.17.jar:${base.path}/bnd-5.1.1/biz.aQute.bnd-5.1.1.jar:${ant.includes}/

[Bug 64850] New: Add support to tomcat for JEP380: Unix domain sockets

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64850

Bug ID: 64850
   Summary: Add support to tomcat for JEP380: Unix domain sockets
   Product: Tomcat 10
   Version: unspecified
  Hardware: PC
Status: NEW
  Severity: normal
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: minf...@apache.org
  Target Milestone: --

Native Java unix domain sockets are coming:

https://openjdk.java.net/jeps/380

It appears Tomcat needs to either support the following description, or be
careful to not do anything that would break this description:

Description

To support Unix-domain socket channels we will add the following API elements:

A new socket address class, java.net.UnixDomainSocketAddress;

A UNIX constant value in the existing java.net.StandardProtocolFamily enum;

New open factory methods on SocketChannel and ServerSocketChannel that specify
the protocol family

Updates to the SocketChannel and ServerSocketChannel specifications to specify
how channels to Unix domain sockets behave.

-- 
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

[Bug 64849] New: Embedded EL module descriptor missing uses and provides clauses

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64849

Bug ID: 64849
   Summary: Embedded EL module descriptor missing uses and
provides clauses
   Product: Tomcat 9
   Version: 9.0.39
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: EL
  Assignee: dev@tomcat.apache.org
  Reporter: rob.pl...@dai.co.uk
  Target Milestone: -

Tomcat Embedded EL has a bug closely related to one reported and fixed to the
core module, issue 64751 "Incomplete module info descriptor". This is the
stacktrace:

java.util.ServiceConfigurationError: javax.el.ExpressionFactory: module
org.apache.tomcat.embed.el does not declare `uses`
[ERROR] at
java.base/java.util.ServiceLoader.fail(ServiceLoader.java:588)
[ERROR] at
java.base/java.util.ServiceLoader.checkCaller(ServiceLoader.java:574)
[ERROR] at
java.base/java.util.ServiceLoader.(ServiceLoader.java:503)
[ERROR] at
java.base/java.util.ServiceLoader.load(ServiceLoader.java:1646)
[ERROR] at
org.apache.tomcat.embed.el@9.0.39/javax.el.ExpressionFactory.getClassNameServices(ExpressionFactory.java:372)
[ERROR] at
org.apache.tomcat.embed.el@9.0.39/javax.el.ExpressionFactory.discoverClassName(ExpressionFactory.java:330)
[ERROR] at
org.apache.tomcat.embed.el@9.0.39/javax.el.ExpressionFactory.newInstance(ExpressionFactory.java:134)
[ERROR] at
org.apache.tomcat.embed.el@9.0.39/javax.el.ExpressionFactory.newInstance(ExpressionFactory.java:86)

Looking at module-info.java and the contents of META-INF/services I think there
are two missing lines for this module descriptor; not just the uses clause, but
also and the provides clauses. Both of these lines need adding:

uses javax.el.ExpressionFactory;
provides javax.el.ExpressionFactory with org.apache.el.ExpressionFactoryImpl;

Both lines are necessary to recreate the service provider / loader mechanism
with the module system; ExpressionFactory has static methods to look up the
implementation (as part of the public newInstance method), so the module uses
its own provided implementation.

-- 
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: Fix cglib download location

2020-10-26 Thread markt

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 aa8bc66  Fix cglib download location
aa8bc66 is described below

commit aa8bc66072eda1d5ebde907690c3a5fd65eeb2d8
Author: Mark Thomas 
AuthorDate: Mon Oct 26 14:30:00 2020 +

Fix cglib download location
---
 build.properties.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.properties.default b/build.properties.default
index c4ab2ba..041ca99 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -273,7 +273,7 @@ cglib.checksum.algorithm=SHA-512
 
cglib.checksum.value=faa1d2121e87ae69e179e3aae217accd0834e0da716b91a029fd526e192612e71675f2740bedf48e23ef1edc45f672a2be1b3e78bbfb1ad59c96dd3d2feeedba
 cglib.home=${base.path}/cglib-${cglib.version}
 cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
-cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
+cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar
 
 # - objenesis, used by EasyMock, version 2.6 or later -
 objenesis.version=2.6


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] 02/02: Fix 64735 ServletContext.addJspFile() always fails with SecurityManager

2020-10-26 Thread Mark Thomas

On 25/10/2020 16:12, Rainer Jung wrote:
> Am 30.09.2020 um 19:03 schrieb ma...@apache.org:
>> 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
>>
>> commit c4b1559d6e7f131be804373719fe41c26969df54



>>   cglib.home=${base.path}/cglib-${cglib.version}
>>   cglib.jar=${cglib.home}/cglib-nodep-${cglib.version}.jar
>>   cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
> 
> It looks to me as if SF doesn't provide cglib 3.3.0. TC 8.5, which also
> uses cglib 3.3.0 contains the following delta:
> 
> -cglib.loc=${base-sf.loc}/cglib/cglib-nodep-${cglib.version}.jar
> +cglib.loc=${base-maven.loc}/cglib/cglib-nodep/${cglib.version}/cglib-nodep-${cglib.version}.jar

Thanks Rainer. Nice catch. I missed that as I already had the JAR
locally and I share a libs directory between all Tomcat versions.

I'll commit a fix shortly.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64848] New: WsSession objects in OUTPUT_CLOSED state are implicitly held by waitingProcessors and GC cannot purge them from the JVM heap

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=64848

Bug ID: 64848
   Summary: WsSession objects in OUTPUT_CLOSED state are
implicitly held by waitingProcessors and GC cannot
purge them from the JVM heap
   Product: Tomcat 9
   Version: 9.0.36
  Hardware: PC
Status: NEW
  Severity: major
  Priority: P4
 Component: WebSocket
  Assignee: dev@tomcat.apache.org
  Reporter: laszlo.peter.karo...@gmail.com
  Target Milestone: -

Created attachment 37534
  --> https://bz.apache.org/bugzilla/attachment.cgi?id=37534=edit
Attachment with the 3 services that help reproduce the issue +
SocketTimeoutException stack trace and WsSession GC root snapshot from a heap
dump

Overview:
-

WebSocket session objects (represented as WsSession) "get stuck" on the heap
under heavy load in case Tomcat acts as a WebSocket API gateway between a
client and a server application.
By assuming a system configuration where the Tomcat WebSocket API gateway
service is deployed along with a server application on the same machine but the
client is launched elsewhere then the network latency can impose a considerable
overhead on the entire client-side data processing compared to the server side
where the data can be generated and transferred to the gateway service much
faster than the client can consume it and this can lead to the classic fast
producer-slow consumer phenomenon.

If the network latency goes beyond a certain threshold and the client cannot
keep up in a timely manner with the data flow coming from the gateway service
then Tomcat starts throwing SocketTimeoutException (by default after 20
seconds) at the WebSocket sessions for which the data weren't transmitted in
time. Such a timeout may end up in an abnormally closed WebSocket connection
(usually represented with 1006 status code at the client side) and even though
the corresponding sessions are moved into the OUTPUT_CLOSED state at Tomcat
level, they are still kept on the JVM heap endlessly by preventing the GC to
purge them out consequently producing a slow memory leak.

Steps to Reproduce:
---

Reproducing such a situation is a bit cumbersome in terms of the required
hardware configuration as it needs two machines/VMs: one for the client and
another for the Tomcat WebSocket API gateway + server application. On the other
hand the client app should be hosted "far" from the Tomcat WebSocket app in
terms of network distance, i.e. if it connects to the Tomcat WebSocket app via
VPN then the network latency can be enough to reproduce the issue.
Alternatively in the Tomcat WebSocket app the
org.apache.tomcat.websocket.BLOCKING_SEND_TIMEOUT property can also be adjusted
as part of a customized RequestUpgradeStrategy to simulate a slow network.
The overall system demonstrates a simple distributed client-server application
inserting the Tomcat WebSocket API GW as an intermediary. The client can send a
number to the server that denotes a length (given in KBs) so the server will
respond with a random alphanumeric string having a length specified by the
given number. The Tomcat WebSocket API GW just routes the WS traffic back and
forth between the other two services.

1. Run the attached
random-string-ws-provider-undertow-1.0.0-SNAPSHOT-jar-with-dependencies
application (the server app) in a form of

java -jar
random-string-ws-provider-undertow-1.0.0-SNAPSHOT-jar-with-dependencies 


By default it configures the underlying Undertow webserver to launch on
localhost and listen on port #8193.

2. Run the attached ws-api-gateway-tomcat-1.0.0-SNAPSHOT.jar application (the
Tomcat WebSocket API GW app) in a form of

java -jar ws-api-gateway-tomcat-1.0.0-SNAPSHOT.jar

By default it listens on port #8444 and it can be overridden by setting the
server.port property.
If the Undertow server app runs with non-default host and port configurations
then this needs to be reflected here by specifying the
zuul.routes.random-string-websocket-provider.url property accordingly, e.g.:

java -jar
-Dzuul.routes.random-string-websocket-provider.url=http://:
ws-api-gateway-tomcat-1.0.0-SNAPSHOT.jar

3. Run the attached ws-random-string-gatling-load-test application (the client
app wrapped into gatling to generate artifical load) in a form of

mvn clean -B compile exec:java -Dexec.mainClass=RandomStringWebSocketRequestApp
-DrampUpUsers= -DrampUpTime=1
-DserverUrl=
-DserverPort=
-Dgatling.simulationClass=com.acme.wsrequest.simulation.RandomStringWebSocketRequestSimulation
-DrandomStringLengthInKb=1000

Actual Results:
---

Running the client app with 400 users will start producing the
SocketTimeoutException confidently in the Tomcat WebSocket API gateway service.
At the client side the gatling report starts showing unexpectedly closed WS
connections (with status code 1006) and the number of such connections seems to
have a strong correspondence

[Bug 63191] RemoteEndpoint.Async#sendText(String, SendHandler) never calls the callback

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=63191

--- Comment #17 from Boris Petrov  ---
Still happening on Tomcat 9.0.39 and CometD 5.0.1. It seemed to work for a day
or two (being accessed mostly from Chrome and Firefox) but then a connection
from Safari broke it again. Bot sure how this could be relevant but just
mentioning it. Here is the blocked thread's stack:

java.lang.Thread.State: WAITING (parking)
 at jdk.internal.misc.Unsafe.park(java.base@14.0.1/Native Method)
 - parking to wait for  <0x00065a4c4ad8> (a
java.util.concurrent.CompletableFuture$Signaller)
 at
java.util.concurrent.locks.LockSupport.park(java.base@14.0.1/LockSupport.java:211)
 at
java.util.concurrent.CompletableFuture$Signaller.block(java.base@14.0.1/CompletableFuture.java:1860)
 at
java.util.concurrent.ForkJoinPool.managedBlock(java.base@14.0.1/ForkJoinPool.java:3137)
 at
java.util.concurrent.CompletableFuture.waitingGet(java.base@14.0.1/CompletableFuture.java:1887)
 at
java.util.concurrent.CompletableFuture.get(java.base@14.0.1/CompletableFuture.java:2062)
 at
org.cometd.server.websocket.javax.WebSocketEndPoint.onMessage(WebSocketEndPoint.java:64)
 at
org.cometd.server.websocket.javax.WebSocketEndPoint.onMessage(WebSocketEndPoint.java:37)
 at
org.apache.tomcat.websocket.WsFrameBase.sendMessageText(WsFrameBase.java:402)
 at
org.apache.tomcat.websocket.server.WsFrameServer.sendMessageText(WsFrameServer.java:119)
 at
org.apache.tomcat.websocket.WsFrameBase.processDataText(WsFrameBase.java:502)
 at
org.apache.tomcat.websocket.WsFrameBase.processData(WsFrameBase.java:301)
 at
org.apache.tomcat.websocket.WsFrameBase.processInputBuffer(WsFrameBase.java:133)
 at
org.apache.tomcat.websocket.server.WsFrameServer.onDataAvailable(WsFrameServer.java:82)
 at
org.apache.tomcat.websocket.server.WsFrameServer.doOnDataAvailable(WsFrameServer.java:171)
 at
org.apache.tomcat.websocket.server.WsFrameServer.notifyDataAvailable(WsFrameServer.java:151)
 at
org.apache.tomcat.websocket.server.WsHttpUpgradeHandler.upgradeDispatch(WsHttpUpgradeHandler.java:148)
 at
org.apache.coyote.http11.upgrade.UpgradeProcessorInternal.dispatch(UpgradeProcessorInternal.java:54)
 at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:59)
 at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:868)
 at
org.apache.tomcat.util.net.AprEndpoint$SocketProcessor.doRun(AprEndpoint.java:1991)
 at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
 - locked <0x00065a4c4c18> (a
org.apache.tomcat.util.net.AprEndpoint$AprSocketWrapper)
 at
java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@14.0.1/ThreadPoolExecutor.java:1130)
 at
java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@14.0.1/ThreadPoolExecutor.java:630)
 at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
 at java.lang.Thread.run(java.base@14.0.1/Thread.java:832)

-- 
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

[Bug 53814] Could not display PDF file on Tomcat 7.0.27 above.

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=53814

Alex Veer  changed:

   What|Removed |Added

   Keywords||Beginner
URL||https://www.cpmsystems.in/
 Status|RESOLVED|VERIFIED
 Resolution|INVALID |FIXED

--- Comment #7 from Alex Veer  ---
Embassy Attestation Services in Delhi
https://www.certificateattestaion.co.in/

-- 
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

[Bug 63690] [HTTP/2] The socket [*] associated with this connection has been closed.

2020-10-26 Thread bugzilla

https://bz.apache.org/bugzilla/show_bug.cgi?id=63690

Boris Petrov  changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

--- Comment #24 from Boris Petrov  ---
Mark, we're still seeing randomly this error even on the latest Tomcat (9.0.39)
and with `overheadDataThreshold="0"`. Java version is 15 (but we've been seeing
it on all previous too). Any suggestions what can we do?

javax.ws.rs.ProcessingException: Failed to buffer the message content input
stream.
at
org.glassfish.jersey.message.internal.InboundMessageContext.bufferEntity(InboundMessageContext.java:942)
at com.company.rest.filters.Filter.filter(SourceFile:58)
at
org.glassfish.jersey.server.ContainerFilteringStage.apply(ContainerFilteringStage.java:108)
at
org.glassfish.jersey.server.ContainerFilteringStage.apply(ContainerFilteringStage.java:44)
at
org.glassfish.jersey.process.internal.Stages.process(Stages.java:173)
at
org.glassfish.jersey.server.ServerRuntime$1.run(ServerRuntime.java:247)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:248)
at org.glassfish.jersey.internal.Errors$1.call(Errors.java:244)
at org.glassfish.jersey.internal.Errors.process(Errors.java:292)
at org.glassfish.jersey.internal.Errors.process(Errors.java:274)
at org.glassfish.jersey.internal.Errors.process(Errors.java:244)
at
org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:265)
at
org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:234)
at
org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:680)
at
org.glassfish.jersey.servlet.WebComponent.serviceImpl(WebComponent.java:394)
at
org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:346)
at
org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:366)
at
org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:319)
at
org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:205)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:231)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at
org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:53)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at
org.apache.shiro.web.servlet.AbstractShiroFilter.executeChain(AbstractShiroFilter.java:450)
at
org.apache.shiro.web.servlet.AbstractShiroFilter$1.call(AbstractShiroFilter.java:365)
at
org.apache.shiro.subject.support.SubjectCallable.doCall(SubjectCallable.java:90)
at
org.apache.shiro.subject.support.SubjectCallable.call(SubjectCallable.java:83)
at
org.apache.shiro.subject.support.DelegatingSubject.execute(DelegatingSubject.java:387)
at
org.apache.shiro.web.servlet.AbstractShiroFilter.doFilterInternal(AbstractShiroFilter.java:362)
at
org.apache.shiro.web.servlet.OncePerRequestFilter.doFilter(OncePerRequestFilter.java:125)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at
org.apache.logging.log4j.web.Log4jServletFilter.doFilter(Log4jServletFilter.java:71)
at
org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:193)
at
org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:166)
at
org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:202)
at
org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:97)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:542)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
at
org.apache.catalina.valves.rewrite.RewriteValve.invoke(RewriteValve.java:555)
at
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:690)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:343)
at
org.apache.coyote.http2.StreamProcessor.service(StreamProcessor.java:395)
at

60 matches

Mail list logo