You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/05/04 16:24:20 UTC
[tomcat] branch 8.5.x updated (c82d864 -> cf861cb)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from c82d864 Correct backport. web.xml versions are 3.1 for Tomcat 8.5.x
new 918a5a8 Fix earlier back-porting error
new cf861cb Fix indent
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
java/org/apache/jasper/resources/LocalStrings.properties | 7 +++----
java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix indent
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cf861cbcb636cfcabc79f95390312374e986a91d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 4 17:23:42 2020 +0100
Fix indent
---
java/org/apache/jasper/resources/LocalStrings_es.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/jasper/resources/LocalStrings_es.properties b/java/org/apache/jasper/resources/LocalStrings_es.properties
index 7d1b61e..7526cfc 100644
--- a/java/org/apache/jasper/resources/LocalStrings_es.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_es.properties
@@ -325,7 +325,7 @@ y donde <opciones> incluyen:\n\
\ -ieplugin <clsid> Java Plugin classid para Internet Explorer\n\
\ -classpath <path> Pasa por alto la propiedad de sistema java.class.path\n\
\ -xpoweredBy Añade cabecera de respuesta X-Powered-By\n\
-\ -trimSpaces Remove template text that consists entirely of whitespace\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.7)\n\
\ -target <version> Set the -target argument to the compiler (default 1.7)\n
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Fix earlier back-porting error
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org