This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 918a5a812dfbc621c1a4201f5698419801984cd7 Author: Mark Thomas <ma...@apache.org> AuthorDate: Mon May 4 17:20:15 2020 +0100 Fix earlier back-porting error --- java/org/apache/jasper/resources/LocalStrings.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/java/org/apache/jasper/resources/LocalStrings.properties b/java/org/apache/jasper/resources/LocalStrings.properties index 44ed90d..445b19b 100644 --- a/java/org/apache/jasper/resources/LocalStrings.properties +++ b/java/org/apache/jasper/resources/LocalStrings.properties @@ -348,11 +348,10 @@ where options include:\n\ \ -ieplugin <clsid> Java Plugin classid for Internet Explorer\n\ \ -classpath <path> Overrides java.class.path system property\n\ \ -xpoweredBy Add X-Powered-By response header\n\ -\ -trimSpaces [single] Remove template text that consists entirely of whitespace\n\ -\ (if "single", replace such template text with a single space)\n\ +\ -trimSpaces Remove template text that consists entirely of whitespace\n\ \ -javaEncoding <enc> Set the encoding charset for Java classes (default UTF-8)\n\ -\ -source <version> Set the -source argument to the compiler (default 1.8)\n\ -\ -target <version> Set the -target argument to the compiler (default 1.8)\n\ +\ -source <version> Set the -source argument to the compiler (default 1.7)\n\ +\ -target <version> Set the -target argument to the compiler (default 1.7)\n\ \ -threadCount <count> Number of threads to use for compilation.\n\ \ ("2.0C" means two threads per core)\n jspc.webfrg.footer=\n\ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org