[tomcat] branch 8.5.x updated: Expand Locale <-> charset mapping

2022-01-27 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 1a67546  Expand Locale <-> charset mapping
1a67546 is described below

commit 1a67546879d30131641d7a6aa6b86c34ef9f0b22
Author: Mark Thomas 
AuthorDate: Thu Jan 27 10:54:42 2022 +

Expand Locale <-> charset mapping

This particular mapping is now used by the TCK to test
ServletReponse.setLocale() so we need this to pass those tests.
---
 java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 +
 webapps/docs/changelog.xml| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties 
b/java/org/apache/catalina/util/CharsetMapperDefault.properties
index 6f8bf49..d438bcf 100644
--- a/java/org/apache/catalina/util/CharsetMapperDefault.properties
+++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties
@@ -15,3 +15,4 @@
 
 en=ISO-8859-1
 fr=ISO-8859-1
+ja=Shift_JIS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 378380a..6d146f6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
 list of JARs to skip when scanning for TLDs, web fragments and
 annotations. (michaelo)
   
+  
+Expand the default mappings used by
+ServletResponse.setLocale() to include a mapping from the
+ja locale to the Shift_JIS encoding. (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: Expand Locale <-> charset mapping

2022-01-27 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new ad8d837  Expand Locale <-> charset mapping
ad8d837 is described below

commit ad8d837ea335928d74833509e4f96747b97b503b
Author: Mark Thomas 
AuthorDate: Thu Jan 27 10:54:42 2022 +

Expand Locale <-> charset mapping

This particular mapping is now used by the TCK to test
ServletReponse.setLocale() so we need this to pass those tests.
---
 java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 +
 webapps/docs/changelog.xml| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties 
b/java/org/apache/catalina/util/CharsetMapperDefault.properties
index 6f8bf49..d438bcf 100644
--- a/java/org/apache/catalina/util/CharsetMapperDefault.properties
+++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties
@@ -15,3 +15,4 @@
 
 en=ISO-8859-1
 fr=ISO-8859-1
+ja=Shift_JIS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 540c4ba..a40544d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
 list of JARs to skip when scanning for TLDs, web fragments and
 annotations. (michaelo)
   
+  
+Expand the default mappings used by
+ServletResponse.setLocale() to include a mapping from the
+ja locale to the Shift_JIS encoding. (markt)
+  
 
   
   

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



[tomcat] branch 10.0.x updated: Expand Locale <-> charset mapping

2022-01-27 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new c2c57fb  Expand Locale <-> charset mapping
c2c57fb is described below

commit c2c57fb17a3eaa8d4b89671fc36c03db511e79f3
Author: Mark Thomas 
AuthorDate: Thu Jan 27 10:54:42 2022 +

Expand Locale <-> charset mapping

This particular mapping is now used by the TCK to test
ServletReponse.setLocale() so we need this to pass those tests.
---
 java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 +
 webapps/docs/changelog.xml| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties 
b/java/org/apache/catalina/util/CharsetMapperDefault.properties
index 6f8bf49..d438bcf 100644
--- a/java/org/apache/catalina/util/CharsetMapperDefault.properties
+++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties
@@ -15,3 +15,4 @@
 
 en=ISO-8859-1
 fr=ISO-8859-1
+ja=Shift_JIS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 303d8f7..2afd5bc 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
 list of JARs to skip when scanning for TLDs, web fragments and
 annotations. (michaelo)
   
+  
+Expand the default mappings used by
+ServletResponse.setLocale() to include a mapping from the
+ja locale to the Shift_JIS encoding. (markt)
+  
 
   
   

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



[tomcat] branch main updated: Expand Locale <-> charset mapping

2022-01-27 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new eda77cd  Expand Locale <-> charset mapping
eda77cd is described below

commit eda77cd88b84d6002d9efb818e6d3fbc241e2284
Author: Mark Thomas 
AuthorDate: Thu Jan 27 10:54:42 2022 +

Expand Locale <-> charset mapping

This particular mapping is now used by the TCK to test
ServletReponse.setLocale() so we need this to pass those tests.
---
 java/org/apache/catalina/util/CharsetMapperDefault.properties | 1 +
 webapps/docs/changelog.xml| 5 +
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/catalina/util/CharsetMapperDefault.properties 
b/java/org/apache/catalina/util/CharsetMapperDefault.properties
index 6f8bf49..d438bcf 100644
--- a/java/org/apache/catalina/util/CharsetMapperDefault.properties
+++ b/java/org/apache/catalina/util/CharsetMapperDefault.properties
@@ -15,3 +15,4 @@
 
 en=ISO-8859-1
 fr=ISO-8859-1
+ja=Shift_JIS
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2bac183..6684bf9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
 list of JARs to skip when scanning for TLDs, web fragments and
 annotations. (michaelo)
   
+  
+Expand the default mappings used by
+ServletResponse.setLocale() to include a mapping from the
+ja locale to the Shift_JIS encoding. (markt)
+  
 
   
   

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



[tomcat] 04/07: Reproducibility for tomcat-jdbc when built as part of Tomcat

2022-01-26 Thread markt
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 1c10bf30f622ce77052de1673062b50c81b1f6bf
Author: Mark Thomas 
AuthorDate: Mon Jan 24 18:42:39 2022 +

Reproducibility for tomcat-jdbc when built as part of Tomcat
---
 modules/jdbc-pool/build.xml | 24 
 webapps/docs/changelog.xml  |  8 
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 613ff4c..b66a306 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -49,11 +49,12 @@
   
 
   
-  
-  
-  
-  
+  
+  
+  
+  
   
+  
 
   
   
@@ -79,7 +80,7 @@
 
   
 
-  
+  
 
 
   
@@ -111,6 +112,15 @@
   
   
 
+
+  
+
+  
+
+
+
   
 
   
@@ -168,9 +178,7 @@
   
 
   
-  
-
-  
+  
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e1e9960..b89458d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] 07/07: Add entry for move to building with Java 11

2022-01-26 Thread markt
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 d53cdd2bc4349b9d12832a74c37ab1cffe8fa8a2
Author: Mark Thomas 
AuthorDate: Wed Jan 26 16:32:22 2022 +

Add entry for move to building with Java 11
---
 webapps/docs/changelog.xml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c029186..378380a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -138,6 +138,12 @@
   
 
   
+Switch to building with Java 11 and using --release to
+target Java 8. Once back-ported to all currently supported branches,
+this will reduce the number of Java versions developers need to juggle.
+(markt)
+  
+  
 Use LF line endings for text files in JARs to support reproducible
 builds across different operating systems. (markt)
   

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



[tomcat] 06/07: Silence a dependabot nag (it is a test dependency)

2022-01-26 Thread markt
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 eb2b81b3b5e4e8eb101eff9dbe9ea3924f1005c9
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:43:53 2022 +

Silence a dependabot nag (it is a test dependency)
---
 modules/jdbc-pool/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 7a32f8a..3988c46 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -80,7 +80,7 @@
 
   com.h2database
   h2
-  2.0.206
+  2.0.210
   test
 
   

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



[tomcat] 03/07: Reproducible builds: text files in JARs

2022-01-26 Thread markt
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 25b07bd75c932907c8d011dd5afe244a0f8983d2
Author: Mark Thomas 
AuthorDate: Mon Jan 24 11:13:33 2022 +

Reproducible builds: text files in JARs
---
 build.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index c4ffbcb..534daf0 100644
--- a/build.xml
+++ b/build.xml
@@ -719,6 +719,16 @@
 when loading the ResourceBundles -->
 
 
+
+
+
+  
+
+
+  
+
   
 
   

[tomcat] 02/07: Refactor to avoid reproducibility issues due to zip task ordering

2022-01-26 Thread markt
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 a1a805118b4e8dac12c820501be67db7a69c6af5
Author: Mark Thomas 
AuthorDate: Thu Jan 20 20:00:58 2022 +

Refactor to avoid reproducibility issues due to zip task ordering

Ant's zip task orders the entires based OS file names. '/' and '\' have
very different ordering so reafctor to directory names that are not
affected by this so zip files are consistent across Linux and Windows.
---
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |   5 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 30 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java 
b/test/org/apache/catalina/core/TestStandardWrapper.java
index a169b77..a550ae9 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -196,7 +196,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity");
+File appDir = new File("test/webapp-servletsecurity-a");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
@@ -215,7 +215,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity2");
+File appDir = new File("test/webapp-servletsecurity-b");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java 
b/test/org/apache/catalina/loader/TestVirtualContext.java
index c321421..558b209 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -58,7 +58,7 @@ public class TestVirtualContext extends TomcatBaseTest {
 public void testVirtualClassLoader() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
 // app dir is relative to server home
 StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
 appDir.getAbsolutePath());
@@ -67,11 +67,11 @@ public class TestVirtualContext extends TomcatBaseTest {
 File f1 = new File("test/webapp-virtual-webapp/target/classes");
 File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
 File f3 = new File(
-"test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes");
 File f4 = new File(
-"test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+
"test/webapp-vi

[tomcat] 01/07: Reproducible builds: Consistent line endings in text files in JAR manifests

2022-01-26 Thread markt
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 a440261817a71cfccb6a914b852f257904df5726
Author: Mark Thomas 
AuthorDate: Mon Jan 24 10:23:14 2022 +

Reproducible builds: Consistent line endings in text files in JAR manifests
---
 build.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index e356ed9..c4ffbcb 100644
--- a/build.xml
+++ b/build.xml
@@ -739,6 +739,13 @@
   
   
 
+
+
+
+  
+
   
 
   

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



[tomcat] 05/07: Add note about changes for text files in JARs

2022-01-26 Thread markt
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 dc9317cfdefbb66a07bec84614a1c7686b53a593
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:27:14 2022 +

Add note about changes for text files in JARs
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b89458d..c029186 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] branch 8.5.x updated (078071f -> d53cdd2)

2022-01-26 Thread markt
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 078071f  Remove remaining references to compile.source and 
compile.target
 new a440261  Reproducible builds: Consistent line endings in text files in 
JAR manifests
 new a1a8051  Refactor to avoid reproducibility issues due to zip task 
ordering
 new 25b07bd  Reproducible builds: text files in JARs
 new 1c10bf3  Reproducibility for tomcat-jdbc when built as part of Tomcat
 new dc9317c  Add note about changes for text files in JARs
 new eb2b81b  Silence a dependabot nag (it is a test dependency)
 new d53cdd2  Add entry for move to building with Java 11

The 7 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.xml  |  17 +
 modules/jdbc-pool/build.xml|  24 --
 modules/jdbc-pool/pom.xml  |   2 +-
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |  27 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 33 files changed, 82 insertions(+), 30 deletions(-)
 rename test/{webapp-servletsecurity => 
webapp-servletsecurity-a}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/protected.jsp (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/unprotected.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => webapp-a}/WEB-INF/A.tld 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/classes/rsrc/resourceA.properties (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/lib/rsrc.jar (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/web.xml (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceAsStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceUrlThenGetStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResources.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetRealPath.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetResource.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetResourcePaths.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/rsrc/resourceF.properties (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => webapp-a}/testTlds.jsp 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp2 => webapp-b}/WEB-INF/D.tld 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp2/WEB-INF/classes/rsrc2 => 
webapp-b/WEB-INF/classes/rsrc-2}/resourceK.properties (100%)
 rename test/webapp-virtual-

[tomcat] 07/08: Add note about changes for text files in JARs

2022-01-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 6e3d4e0d4d5afd107c03e0adcef4f4e106456fa0
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:27:14 2022 +

Add note about changes for text files in JARs
---
 webapps/docs/changelog.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b981d3e..540c4ba 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -143,6 +143,10 @@
 this will reduce the number of Java versions developers need to juggle.
 (markt)
   
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
 
   
 

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



[tomcat] 03/08: Refactor to avoid reproducibility issues due to zip task ordering

2022-01-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 16c2bf323a29ebdd6d2aad600cd360c3ac6e285b
Author: Mark Thomas 
AuthorDate: Thu Jan 20 20:00:58 2022 +

Refactor to avoid reproducibility issues due to zip task ordering

Ant's zip task orders the entires based OS file names. '/' and '\' have
very different ordering so reafctor to directory names that are not
affected by this so zip files are consistent across Linux and Windows.
---
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |   5 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 30 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java 
b/test/org/apache/catalina/core/TestStandardWrapper.java
index fbd0046..fbcf63d 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -196,7 +196,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity");
+File appDir = new File("test/webapp-servletsecurity-a");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
@@ -215,7 +215,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity2");
+File appDir = new File("test/webapp-servletsecurity-b");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java 
b/test/org/apache/catalina/loader/TestVirtualContext.java
index 00b615c..fc26aec 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -57,7 +57,7 @@ public class TestVirtualContext extends TomcatBaseTest {
 public void testVirtualClassLoader() throws Exception {
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
 // app dir is relative to server home
 StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
 appDir.getAbsolutePath());
@@ -66,11 +66,11 @@ public class TestVirtualContext extends TomcatBaseTest {
 File f1 = new File("test/webapp-virtual-webapp/target/classes");
 File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
 File f3 = new File(
-"test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes");
 File f4 = new File(
-"test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+
"test/webapp-vi

[tomcat] 01/08: Reproducible builds: Consistent line endings in text files in JAR manifests

2022-01-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 b428e933959ed6450130d068e9847dd75b2037b9
Author: Mark Thomas 
AuthorDate: Mon Jan 24 10:23:14 2022 +

Reproducible builds: Consistent line endings in text files in JAR manifests
---
 build.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index 5e69b11..ad10c64 100644
--- a/build.xml
+++ b/build.xml
@@ -990,6 +990,13 @@
   
   
 
+
+
+
+  
+
   
 
   

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



[tomcat] 05/08: Reproducibility for tomcat-jdbc when built as part of Tomcat

2022-01-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 7364411aad2c8a5d7733d4e04c1569d20ae2dd95
Author: Mark Thomas 
AuthorDate: Mon Jan 24 18:42:39 2022 +

Reproducibility for tomcat-jdbc when built as part of Tomcat
---
 modules/jdbc-pool/build.xml | 24 
 webapps/docs/changelog.xml  |  8 
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 0381503..8b387af 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -49,11 +49,12 @@
   
 
   
-  
-  
-  
-  
+  
+  
+  
+  
   
+  
 
   
   
@@ -79,7 +80,7 @@
 
   
 
-  
+  
 
 
   
@@ -111,6 +112,15 @@
   
   
 
+
+  
+
+  
+
+
+
   
 
   
@@ -168,9 +178,7 @@
   
 
   
-  
-
-  
+  
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 35f26ea..b981d3e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
   
 
   

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



[tomcat] 08/08: Silence a dependabot nag (it is a test dependency)

2022-01-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 518b49b96575baca1301b6440adce482db9458a4
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:43:53 2022 +

Silence a dependabot nag (it is a test dependency)
---
 modules/jdbc-pool/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 58a1425..eb849da 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -82,7 +82,7 @@
 
   com.h2database
   h2
-  2.0.206
+  2.0.210
   test
 
   

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



[tomcat] 04/08: Reproducible builds: text files in JARs

2022-01-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 a515f3a1ccd874a5d76e484f21bf5682a751dbcd
Author: Mark Thomas 
AuthorDate: Mon Jan 24 11:13:33 2022 +

Reproducible builds: text files in JARs
---
 build.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index ad10c64..8d16c2a 100644
--- a/build.xml
+++ b/build.xml
@@ -970,6 +970,16 @@
 when loading the ResourceBundles -->
 
 
+
+
+
+  
+
+
+  
+
   
 
   

[tomcat] 06/08: Reproducible builds: consistent line endings for graal files

2022-01-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 2065a1d027959648e3eaa4504a2eec164a7ef7dd
Author: Mark Thomas 
AuthorDate: Mon Jan 24 19:06:09 2022 +

Reproducible builds: consistent line endings for graal files
---
 build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.xml b/build.xml
index 8d16c2a..8a7ac57 100644
--- a/build.xml
+++ b/build.xml
@@ -3757,6 +3757,9 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
+
+
 

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



[tomcat] 02/08: Reproducible builds. Use the prefiltered files for consistency

2022-01-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 09d7149e247d833fa32356ee71c77ad5fab3aac7
Author: Mark Thomas 
AuthorDate: Mon Jan 24 12:15:07 2022 +

Reproducible builds. Use the prefiltered files for consistency

The prefiltered files have the correct contents and consistent
line endings (LF) across all build platforms
Also removes the need to pre-process these files to perform filtering
---
 res/bnd/build-defaults.bnd | 4 ++--
 res/bnd/jasper-el.jar.tmp.bnd  | 2 +-
 res/bnd/jasper.jar.tmp.bnd | 2 +-
 res/bnd/servlet-api.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 4 ++--
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index d07caa5..753d08f 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -25,8 +25,8 @@ Implementation-Vendor: Apache Software Foundation
 X-Compile-Source-JDK: ${compile.release}
 X-Compile-Target-JDK: ${compile.release}
 
--includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
--includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+-includeresource.notice: META-INF/NOTICE=../../output/manifests/default.notice
+-includeresource.license: 
META-INF/LICENSE=../../output/manifests/default.license
 
 -noclassforname: true
 
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 67a2384..1b96a38 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -26,7 +26,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index d235799..006c721 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -33,7 +33,7 @@ Export-Package: \
 -includepackage: \
 org.apache.jasper.resources
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index ace3872..c7a6a70 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -27,8 +27,8 @@ Provide-Capability: \
 version:List="4.0,3.1,3,2.5";\
 uses:='${packages;NAMED;javax.servlet.*;NAMED;!javax.servlet.jsp.*}'
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 -namesection: javax/servlet*/;\
 Specification-Title='Java API for Servlets';\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index d43c774..96def91 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -96,8 +96,8 @@ Export-Package: \
 org.apache.tomcat.util.net.jsse,\
 org.apache.tomcat.util.threads.res
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd 
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 6e38d0f..a2d63a2 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -27,7 +27,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd 
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 1d17da1..a81d4b3 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@ -35,7 +35

[tomcat] branch 9.0.x updated (2fcf5ef -> 518b49b)

2022-01-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 2fcf5ef  Remove remaining references to compile.source and 
compile.target
 new b428e93  Reproducible builds: Consistent line endings in text files in 
JAR manifests
 new 09d7149  Reproducible builds. Use the prefiltered files for consistency
 new 16c2bf3  Refactor to avoid reproducibility issues due to zip task 
ordering
 new a515f3a  Reproducible builds: text files in JARs
 new 7364411  Reproducibility for tomcat-jdbc when built as part of Tomcat
 new 2065a1d  Reproducible builds: consistent line endings for graal files
 new 6e3d4e0  Add note about changes for text files in JARs
 new 518b49b  Silence a dependabot nag (it is a test dependency)

The 8 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.xml  |  20 +++
 modules/jdbc-pool/build.xml|  24 --
 modules/jdbc-pool/pom.xml  |   2 +-
 res/bnd/build-defaults.bnd |   4 +--
 res/bnd/jasper-el.jar.tmp.bnd  |   2 +-
 res/bnd/jasper.jar.tmp.bnd |   2 +-
 res/bnd/servlet-api.jar.tmp.bnd|   4 +--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |   4 +--
 res/bnd/tomcat-embed-el.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |   2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |   2 +-
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |  17 +
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 42 files changed, 87 insertions(+), 42 deletions(-)
 rename test/{webapp-servletsecurity => 
webapp-servletsecurity-a}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/protected.jsp (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/unprotected.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => webapp-a}/WEB-INF/A.tld 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/classes/rsrc/resourceA.properties (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/lib/rsrc.jar (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/web.xml (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceAsStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceUrlThenGetStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResources.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetRealPath.jsp (100%)
 rename test/w

[tomcat] 08/08: Silence a dependabot nag (it is a test dependency)

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 09b40850d4701bdb2722a4e2b279466f9befda98
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:43:53 2022 +

Silence a dependabot nag (it is a test dependency)
---
 modules/jdbc-pool/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 5daf760..733288d 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -82,7 +82,7 @@
 
   com.h2database
   h2
-  2.0.206
+  2.0.210
   test
 
   

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



[tomcat] 07/08: Add note about changes for text files in JARs

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 71c744121b7b69e4a5a5ed43ce814f520b844633
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:27:14 2022 +

Add note about changes for text files in JARs
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5dcde5c..303d8f7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] 05/08: Reproducibility for tomcat-jdbc when built as part of Tomcat

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 70e68982ec38814d484339012507393000939fbe
Author: Mark Thomas 
AuthorDate: Mon Jan 24 18:42:39 2022 +

Reproducibility for tomcat-jdbc when built as part of Tomcat
---
 modules/jdbc-pool/build.xml | 24 
 webapps/docs/changelog.xml  |  8 
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 0381503..8b387af 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -49,11 +49,12 @@
   
 
   
-  
-  
-  
-  
+  
+  
+  
+  
   
+  
 
   
   
@@ -79,7 +80,7 @@
 
   
 
-  
+  
 
 
   
@@ -111,6 +112,15 @@
   
   
 
+
+  
+
+  
+
+
+
   
 
   
@@ -168,9 +178,7 @@
   
 
   
-  
-
-  
+  
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2546d3b..5dcde5c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] 06/08: Reproducible builds: consistent line endings for graal files

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 69163197d8aca7f48052c90ebfcb78289784882e
Author: Mark Thomas 
AuthorDate: Mon Jan 24 19:06:09 2022 +

Reproducible builds: consistent line endings for graal files
---
 build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.xml b/build.xml
index 846ed21..44700f6 100644
--- a/build.xml
+++ b/build.xml
@@ -3785,6 +3785,9 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
+
+
 

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



[tomcat] 02/08: Reproducible builds. Use the prefiltered files for consistency

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 3cf06a09978a8e309693337126bc43dcb18a9581
Author: Mark Thomas 
AuthorDate: Mon Jan 24 12:15:07 2022 +

Reproducible builds. Use the prefiltered files for consistency

The prefiltered files have the correct contents and consistent
line endings (LF) across all build platforms
Also removes the need to pre-process these files to perform filtering
---
 res/bnd/build-defaults.bnd | 4 ++--
 res/bnd/jasper-el.jar.tmp.bnd  | 2 +-
 res/bnd/jasper.jar.tmp.bnd | 2 +-
 res/bnd/servlet-api.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 4 ++--
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index d07caa5..753d08f 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -25,8 +25,8 @@ Implementation-Vendor: Apache Software Foundation
 X-Compile-Source-JDK: ${compile.release}
 X-Compile-Target-JDK: ${compile.release}
 
--includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
--includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+-includeresource.notice: META-INF/NOTICE=../../output/manifests/default.notice
+-includeresource.license: 
META-INF/LICENSE=../../output/manifests/default.license
 
 -noclassforname: true
 
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 67a2384..1b96a38 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -26,7 +26,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index d235799..006c721 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -33,7 +33,7 @@ Export-Package: \
 -includepackage: \
 org.apache.jasper.resources
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 6877d3f..d925761 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -27,8 +27,8 @@ Provide-Capability: \
 version:Version=${servlet.spec.version};\
 
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 -namesection: jakarta/servlet*/;\
 Specification-Title=Jakarta Servlet;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 40e7f17..fa509b8 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -96,8 +96,8 @@ Export-Package: \
 org.apache.tomcat.util.net.jsse,\
 org.apache.tomcat.util.threads.res
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd 
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 1567ec9..03d75a5 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -27,7 +27,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd 
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 4ae7954..3987ceb 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@

[tomcat] 03/08: Refactor to avoid reproducibility issues due to zip task ordering

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 2f9fecae9711bd392b380d941a7909662866ed15
Author: Mark Thomas 
AuthorDate: Thu Jan 20 20:00:58 2022 +

Refactor to avoid reproducibility issues due to zip task ordering

Ant's zip task orders the entires based OS file names. '/' and '\' have
very different ordering so reafctor to directory names that are not
affected by this so zip files are consistent across Linux and Windows.
---
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |   5 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 30 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java 
b/test/org/apache/catalina/core/TestStandardWrapper.java
index 6a68f30..dc0a24a 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -196,7 +196,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity");
+File appDir = new File("test/webapp-servletsecurity-a");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
@@ -215,7 +215,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity2");
+File appDir = new File("test/webapp-servletsecurity-b");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java 
b/test/org/apache/catalina/loader/TestVirtualContext.java
index c8d8845..4302af7 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -58,7 +58,7 @@ public class TestVirtualContext extends TomcatBaseTest {
 
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
 // app dir is relative to server home
 StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
 appDir.getAbsolutePath());
@@ -67,11 +67,11 @@ public class TestVirtualContext extends TomcatBaseTest {
 File f1 = new File("test/webapp-virtual-webapp/target/classes");
 File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
 File f3 = new File(
-"test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes");
 File f4 = new File(
-"test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes");

[tomcat] 04/08: Reproducible builds: text files in JARs

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit bd4f992b490832a4b0c22598a24aad011d14c2f8
Author: Mark Thomas 
AuthorDate: Mon Jan 24 11:13:33 2022 +

Reproducible builds: text files in JARs
---
 build.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index 467232f..846ed21 100644
--- a/build.xml
+++ b/build.xml
@@ -971,6 +971,16 @@
 when loading the ResourceBundles -->
 
 
+
+
+
+  
+
+
+  
+
   
 
   

[tomcat] 01/08: Reproducible builds: Consistent line endings in text files in JAR manifests

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit e5244a6143d79ae4718fcd1b780b9079d1f90add
Author: Mark Thomas 
AuthorDate: Mon Jan 24 10:23:14 2022 +

Reproducible builds: Consistent line endings in text files in JAR manifests
---
 build.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index 8e29276..467232f 100644
--- a/build.xml
+++ b/build.xml
@@ -997,6 +997,13 @@
   
   
 
+
+
+
+  
+
   
 
   

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



[tomcat] branch 10.0.x updated (bab6bf8 -> 09b4085)

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from bab6bf8  Remove remaining references to compile.source and 
compile.target
 new e5244a6  Reproducible builds: Consistent line endings in text files in 
JAR manifests
 new 3cf06a0  Reproducible builds. Use the prefiltered files for consistency
 new 2f9feca  Refactor to avoid reproducibility issues due to zip task 
ordering
 new bd4f992  Reproducible builds: text files in JARs
 new 70e6898  Reproducibility for tomcat-jdbc when built as part of Tomcat
 new 6916319  Reproducible builds: consistent line endings for graal files
 new 71c7441  Add note about changes for text files in JARs
 new 09b4085  Silence a dependabot nag (it is a test dependency)

The 8 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.xml  |  20 +++
 modules/jdbc-pool/build.xml|  24 --
 modules/jdbc-pool/pom.xml  |   2 +-
 res/bnd/build-defaults.bnd |   4 +--
 res/bnd/jasper-el.jar.tmp.bnd  |   2 +-
 res/bnd/jasper.jar.tmp.bnd |   2 +-
 res/bnd/servlet-api.jar.tmp.bnd|   4 +--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |   4 +--
 res/bnd/tomcat-embed-el.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |   2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |   2 +-
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |  21 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 42 files changed, 91 insertions(+), 42 deletions(-)
 rename test/{webapp-servletsecurity => 
webapp-servletsecurity-a}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/protected.jsp (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/unprotected.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => webapp-a}/WEB-INF/A.tld 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/classes/rsrc/resourceA.properties (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/lib/rsrc.jar (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/web.xml (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceAsStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceUrlThenGetStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResources.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetRealPath.jsp (100%)
 rename test/w

[tomcat] branch main updated: Silence a dependabot nag (it is a test dependency)

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new a05603d  Silence a dependabot nag (it is a test dependency)
a05603d is described below

commit a05603de0fc5ae1ee60d41ea8677f96818a9b11f
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:43:53 2022 +

Silence a dependabot nag (it is a test dependency)
---
 modules/jdbc-pool/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 8366753..b56b2f6 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -82,7 +82,7 @@
 
   com.h2database
   h2
-  2.0.206
+  2.0.210
   test
 
   

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



[tomcat] 05/07: Reproducibility for tomcat-jdbc when built as part of Tomcat

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit dd712d21c5908ea82f34577f9315906616deb553
Author: Mark Thomas 
AuthorDate: Mon Jan 24 18:42:39 2022 +

Reproducibility for tomcat-jdbc when built as part of Tomcat
---
 modules/jdbc-pool/build.xml | 24 
 webapps/docs/changelog.xml  |  8 
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 0381503..8b387af 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -49,11 +49,12 @@
   
 
   
-  
-  
-  
-  
+  
+  
+  
+  
   
+  
 
   
   
@@ -79,7 +80,7 @@
 
   
 
-  
+  
 
 
   
@@ -111,6 +112,15 @@
   
   
 
+
+  
+
+  
+
+
+
   
 
   
@@ -168,9 +178,7 @@
   
 
   
-  
-
-  
+  
   
 
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2a1b57e..73e4d04 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] 06/07: Reproducible builds: consistent line endings for graal files

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit fd935d4195744cfe712ab3d179b581c775332d7a
Author: Mark Thomas 
AuthorDate: Mon Jan 24 19:06:09 2022 +

Reproducible builds: consistent line endings for graal files
---
 build.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.xml b/build.xml
index 97c8dc2..6e1e83e 100644
--- a/build.xml
+++ b/build.xml
@@ -3830,6 +3830,9 @@ Read the Building page on the Apache Tomcat documentation 
site for details on ho
 
   
 
+
+
 

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



[tomcat] 07/07: Add note about changes for text files in JARs

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 841b4b94955877ef8abba1c88d0f5e174a37f603
Author: Mark Thomas 
AuthorDate: Wed Jan 26 15:27:14 2022 +

Add note about changes for text files in JARs
---
 webapps/docs/changelog.xml | 8 
 1 file changed, 8 insertions(+)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 73e4d04..2bac183 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,14 @@
   
 
   
+  
+
+  
+Use LF line endings for text files in JARs to support reproducible
+builds across different operating systems. (markt)
+  
+
+  
 
 
   

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



[tomcat] 04/07: Reproducible builds: text files in JARs

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 925527b436586477d9231172dc6542b21b8dd537
Author: Mark Thomas 
AuthorDate: Mon Jan 24 11:13:33 2022 +

Reproducible builds: text files in JARs
---
 build.xml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/build.xml b/build.xml
index 1f1944c..97c8dc2 100644
--- a/build.xml
+++ b/build.xml
@@ -976,6 +976,16 @@
 when loading the ResourceBundles -->
 
 
+
+
+
+  
+
+
+  
+
   
 
   

[tomcat] 01/07: Reproducible builds: Consistent line endings in text files in JAR manifests

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit fc7c4136c9bd74825993c8b8536d7a6305977292
Author: Mark Thomas 
AuthorDate: Mon Jan 24 10:23:14 2022 +

Reproducible builds: Consistent line endings in text files in JAR manifests
---
 build.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/build.xml b/build.xml
index 710cc0c..1f1944c 100644
--- a/build.xml
+++ b/build.xml
@@ -1002,6 +1002,13 @@
   
   
 
+
+
+
+  
+
   
 
   

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



[tomcat] 02/07: Reproducible builds. Use the prefiltered files for consistency

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 66198545717ed07f3638a6f50f6f4f08bbfc40d1
Author: Mark Thomas 
AuthorDate: Mon Jan 24 12:15:07 2022 +

Reproducible builds. Use the prefiltered files for consistency

The prefiltered files have the correct contents and consistent
line endings (LF) across all build platforms
Also removes the need to pre-process these files to perform filtering
---
 res/bnd/build-defaults.bnd | 4 ++--
 res/bnd/jasper-el.jar.tmp.bnd  | 2 +-
 res/bnd/jasper.jar.tmp.bnd | 2 +-
 res/bnd/servlet-api.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 4 ++--
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index d07caa5..753d08f 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -25,8 +25,8 @@ Implementation-Vendor: Apache Software Foundation
 X-Compile-Source-JDK: ${compile.release}
 X-Compile-Target-JDK: ${compile.release}
 
--includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
--includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+-includeresource.notice: META-INF/NOTICE=../../output/manifests/default.notice
+-includeresource.license: 
META-INF/LICENSE=../../output/manifests/default.license
 
 -noclassforname: true
 
diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 67a2384..1b96a38 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -26,7 +26,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/jasper.jar.tmp.bnd b/res/bnd/jasper.jar.tmp.bnd
index d235799..006c721 100644
--- a/res/bnd/jasper.jar.tmp.bnd
+++ b/res/bnd/jasper.jar.tmp.bnd
@@ -33,7 +33,7 @@ Export-Package: \
 -includepackage: \
 org.apache.jasper.resources
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper.jar/
 
 -jpms-module-info: \
 ${module.name};\
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index f656b97..b1a6740 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -27,8 +27,8 @@ Provide-Capability: \
 version:Version=${servlet.spec.version};\
 
uses:='${packages;NAMED;jakarta.servlet.*;NAMED;!jakarta.servlet.jsp.*}'
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 -namesection: jakarta/servlet*/;\
 Specification-Title=Jakarta Servlet;\
diff --git a/res/bnd/tomcat-embed-core.jar.tmp.bnd 
b/res/bnd/tomcat-embed-core.jar.tmp.bnd
index 48980e7..ed1c656 100644
--- a/res/bnd/tomcat-embed-core.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-core.jar.tmp.bnd
@@ -96,8 +96,8 @@ Export-Package: \
 org.apache.tomcat.util.net.jsse,\
 org.apache.tomcat.util.threads.res
 
--includeresource.notice2: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/servlet-api.jar.notice};@YEAR@;${year}}\n"
--includeresource.license2: 
{META-INF/LICENSE=../META-INF/servlet-api.jar.license}
+-includeresource.notice2: 
META-INF/NOTICE=../../output/manifests/servlet-api.jar.notice
+-includeresource.license2: 
META-INF/LICENSE=../../output/manifests/servlet-api.jar.license
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd 
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index 1567ec9..03d75a5 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -27,7 +27,7 @@ Export-Package: \
 org.apache.el.stream,\
 org.apache.el.util
 
--includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
+-includeresource.meta-inf: /META-INF/=../../output/manifests/jasper-el.jar/
 
 Provide-Capability: \
 osgi.contract;\
diff --git a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd 
b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
index 4ae7954..3987ceb 100644
--- a/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-jasper.jar.tmp.bnd
@@

[tomcat] 03/07: Refactor to avoid reproducibility issues due to zip task ordering

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit bb1c10107f7013d17ba217800b9faba19bfaffb4
Author: Mark Thomas 
AuthorDate: Thu Jan 20 20:00:58 2022 +

Refactor to avoid reproducibility issues due to zip task ordering

Ant's zip task orders the entires based OS file names. '/' and '\' have
very different ordering so reafctor to directory names that are not
affected by this so zip files are consistent across Linux and Windows.
---
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |   5 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 30 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/test/org/apache/catalina/core/TestStandardWrapper.java 
b/test/org/apache/catalina/core/TestStandardWrapper.java
index 4018134..89f11fd 100644
--- a/test/org/apache/catalina/core/TestStandardWrapper.java
+++ b/test/org/apache/catalina/core/TestStandardWrapper.java
@@ -191,7 +191,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity");
+File appDir = new File("test/webapp-servletsecurity-a");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
@@ -210,7 +210,7 @@ public class TestStandardWrapper extends TomcatBaseTest {
 // Setup Tomcat instance
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-servletsecurity2");
+File appDir = new File("test/webapp-servletsecurity-b");
 tomcat.addWebapp(null, "", appDir.getAbsolutePath());
 
 tomcat.start();
diff --git a/test/org/apache/catalina/loader/TestVirtualContext.java 
b/test/org/apache/catalina/loader/TestVirtualContext.java
index c8d8845..4302af7 100644
--- a/test/org/apache/catalina/loader/TestVirtualContext.java
+++ b/test/org/apache/catalina/loader/TestVirtualContext.java
@@ -58,7 +58,7 @@ public class TestVirtualContext extends TomcatBaseTest {
 
 Tomcat tomcat = getTomcatInstance();
 
-File appDir = new File("test/webapp-virtual-webapp/src/main/webapp");
+File appDir = new File("test/webapp-virtual-webapp/src/main/webapp-a");
 // app dir is relative to server home
 StandardContext ctx = (StandardContext) tomcat.addWebapp(null, "/test",
 appDir.getAbsolutePath());
@@ -67,11 +67,11 @@ public class TestVirtualContext extends TomcatBaseTest {
 File f1 = new File("test/webapp-virtual-webapp/target/classes");
 File f2 = new File("test/webapp-virtual-library/target/WEB-INF");
 File f3 = new File(
-"test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes");
 File f4 = new File(
-"test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes");
+
"test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes");
  

[tomcat] branch main updated (52f627e -> 841b4b9)

2022-01-26 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from 52f627e  Update version numbers
 new fc7c413  Reproducible builds: Consistent line endings in text files in 
JAR manifests
 new 6619854  Reproducible builds. Use the prefiltered files for consistency
 new bb1c101  Refactor to avoid reproducibility issues due to zip task 
ordering
 new 925527b  Reproducible builds: text files in JARs
 new dd712d2  Reproducibility for tomcat-jdbc when built as part of Tomcat
 new fd935d4  Reproducible builds: consistent line endings for graal files
 new 841b4b9  Add note about changes for text files in JARs

The 7 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.xml  |  20 +++
 modules/jdbc-pool/build.xml|  24 --
 res/bnd/build-defaults.bnd |   4 +--
 res/bnd/jasper-el.jar.tmp.bnd  |   2 +-
 res/bnd/jasper.jar.tmp.bnd |   2 +-
 res/bnd/servlet-api.jar.tmp.bnd|   4 +--
 res/bnd/tomcat-embed-core.jar.tmp.bnd  |   4 +--
 res/bnd/tomcat-embed-el.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd|   2 +-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd |   2 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |   2 +-
 .../apache/catalina/core/TestStandardWrapper.java  |   4 +--
 .../apache/catalina/loader/TestVirtualContext.java |  28 ++---
 .../WEB-INF/web.xml|   0
 .../WEB-INF/web.xml|   0
 .../protected.jsp  |   0
 .../unprotected.jsp|   0
 .../src/main/{webapp => webapp-a}/WEB-INF/A.tld|   0
 .../WEB-INF/classes/rsrc/resourceA.properties  |   0
 .../main/{webapp => webapp-a}/WEB-INF/lib/rsrc.jar | Bin
 .../src/main/{webapp => webapp-a}/WEB-INF/web.xml  |   0
 .../classpathGetResourceAsStream.jsp   |   0
 .../classpathGetResourceUrlThenGetStream.jsp   |   0
 .../{webapp => webapp-a}/classpathGetResources.jsp |   0
 .../{webapp => webapp-a}/contextGetRealPath.jsp|   0
 .../{webapp => webapp-a}/contextGetResource.jsp|   0
 .../contextGetResourcePaths.jsp|   0
 .../{webapp => webapp-a}/rsrc/resourceF.properties |   0
 .../src/main/{webapp => webapp-a}/testTlds.jsp |   0
 .../src/main/{webapp2 => webapp-b}/WEB-INF/D.tld   |   0
 .../WEB-INF/classes/rsrc-2}/resourceK.properties   |   0
 .../WEB-INF/classes/rsrc/resourceG.properties  |   0
 .../rsrc2 => webapp-b/rsrc-2}/resourceJ.properties |   0
 .../rsrc/resourceF.properties  |   2 +-
 .../rsrc/resourceH.properties  |   0
 webapps/docs/changelog.xml |  21 
 .../WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld  |   0
 webapps/examples/WEB-INF/web.xml   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/book.jsp   |   2 +-
 webapps/examples/jsp/jsp2/simpletag/hello.jsp  |   2 +-
 webapps/examples/jsp/jsp2/simpletag/repeat.jsp |   2 +-
 41 files changed, 90 insertions(+), 41 deletions(-)
 rename test/{webapp-servletsecurity => 
webapp-servletsecurity-a}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/WEB-INF/web.xml (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/protected.jsp (100%)
 rename test/{webapp-servletsecurity2 => 
webapp-servletsecurity-b}/unprotected.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => webapp-a}/WEB-INF/A.tld 
(100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/classes/rsrc/resourceA.properties (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/lib/rsrc.jar (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/WEB-INF/web.xml (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceAsStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResourceUrlThenGetStream.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/classpathGetResources.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetRealPath.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGetResource.jsp (100%)
 rename test/webapp-virtual-webapp/src/main/{webapp => 
webapp-a}/contextGet

svn commit: r1897496 - in /tomcat/site/trunk: docs/security-10.html docs/security-8.html docs/security-9.html xdocs/security-10.xml xdocs/security-8.xml xdocs/security-9.xml

2022-01-26 Thread markt
Author: markt
Date: Wed Jan 26 11:10:26 2022
New Revision: 1897496

URL: http://svn.apache.org/viewvc?rev=1897496=rev
Log:
Publish details of CVE-2022-23181

Modified:
tomcat/site/trunk/docs/security-10.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/security-9.html
tomcat/site/trunk/xdocs/security-10.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/security-9.xml

Modified: tomcat/site/trunk/docs/security-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-10.html?rev=1897496=1897495=1897496=diff
==
--- tomcat/site/trunk/docs/security-10.html (original)
+++ tomcat/site/trunk/docs/security-10.html Wed Jan 26 11:10:26 2022
@@ -1,6 +1,6 @@
 
 Apache Tomcat - Apache Tomcat 10 
vulnerabilitieshttp://tomcat.apache.org/;>Apache 
Tomcathttps://www.apache.org/foundation/contributing.html; target="_blank" 
class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" 
alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left">https://www.google.com/search; method="get">GOApache 
TomcatHomeTaglibsMaven 
PluginDownloadWhich version?https://tomcat.apache.org/download-10.cgi;>Tomcat 10https://tomcat.apache.org/download-90.cgi;>Tomcat 9https://tomcat.apache.org/downlo
 ad-80.cgi">Tomcat 8https://tomcat.apache.org/download-migration.cgi;>Tomcat Migration Tool 
for Jakarta EEhttps://tomcat.apache.org/download-connectors.cgi;>Tomcat 
Connectorshttps://tomcat.apache.org/download-native.cgi;>Tomcat 
Nativehttps://tomcat.apache.org/download-taglibs.cgi;>Taglibshttps://archive.apache.org/dist/tomcat/;>ArchivesDocumentationTomcat 10.1 (alpha)Tomcat 10.0Tomcat 9.0Tomcat 8.5Tomcat ConnectorsTomcat Nativehttps://cwiki.apache.org/confluence/display/TOMCAT;>WikiMigration GuidePresentationshttps://cwiki.apache.org/confluence/x/Bi8lBg;>SpecificationsProblems?Security ReportsFind helphttps://cwiki.apache.org/confluence/display/TOMCAT/FAQ;>FAQMailing ListsBug 
DatabaseIRCGet 
InvolvedOverviewSource codeBuildbothttps://cwiki.apache.org/confluence/x/vIPzBQ;>TranslationsToolsMediahttps://twitter.com/theapachetomcat;>Twitterhttps://www.youtube.com/c/ApacheTomcatOfficial;>YouTubeBlogMiscWho We Arehttps://www.redbubble.com/people/comdev/works/30885254-apache-tomcat;>SwagHeritagehttp://www.apache.org;>Apache HomeResourcesContactLegalhttps://www.apache.org/foundation/contributing.html;>Support 
Apachehttps://www.apache.org/foundation/sponsorship.html;>Sponsorshiphttp://www.apache.org/foundation/thanks.html;>Thankshttp://www.apache.org/licenses/;>LicenseContentTable of Contents
-Apache Tomcat 10.x 
vulnerabilitiesFixed in 
Apache Tomcat 10.0.12Fixed in Apache Tomcat 
10.1.0-M6Fixed in Apache 
Tomcat 10.0.7Fixed in 
Apache Tomcat 10.0.6Fixed 
in Apache Tomcat 10.0.5Fixed in Apache Tomcat 
10.0.4Fixed in Apache 
Tomcat 10.0.2Fixed in 
Apache Tomcat 10.0.0-M10Fixed in Apache Tomcat 
10.0.0-M8Fixed in 
Apache Tomcat 10.0.0-M7Fixed in Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
+Apache Tomcat 10.x 
vulnerabilitiesFixed in 
Apache Tomcat 10.0.16Fixed in Apache Tomcat 
10.1.0-M10Fixed in 
Apache Tomcat 10.0.12Fixed in Apache Tomcat 
10.1.0-M6Fixed in Apache 
Tomcat 10.0.7Fixed in 
Apache Tomcat 10.0.6Fixed 
in Apache Tomcat 10.0.5Fixed in Apache Tomcat 
10.0.4Fixed in Apache 
Tomcat 10.0.2Fixed in 
Apache Tomcat 10.0.0-M10Fixed in Apache Tomcat 10.0.0-M8Fixed in Apache Tomcat 
10.0.0-M7Fixed in 
Apache Tomcat 10.0.0-M6Fixed in Apache Tomcat 
10.0.0-M5Not a 
vulnerability in Tomcat
 Apache Tomcat 10.x 
vulnerabilities
 This page lists all security vulnerabilities fixed in released versions
of Apache Tomcat 10.x. Each vulnerability is given a
@@ -37,6 +37,58 @@
Tomcat Security Team. Thank you.
 
 
+  20 
January 2022 Fixed in Apache Tomcat 10.0.16
+
+Note: The issue below was fixed in Apache Tomcat 10.0.15 but the
+   release vote for the 10.0.15 release candidate did not pass. Therefore,
+   although users must download 10.0.16 to obtain a version that includes a
+   fix for these issues, version 10.0.15 is not included in the list of 
+   affected versions.
+
+Low: Local Privilege Escalation
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-23181; 
rel="nofollow">CVE-2022-23181
+
+The fix for bug http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-9484; 
rel="nofollow">CVE-2020-9484 introduced a time of check, time
+   of use vulnerability that allowed a local attacker to perform actions
+   with the privileges of the user that the Tomcat process is using. This
+   issue is only exploitable when Tomcat is configured to persist sessions
+   usi

[tomcat] branch 8.5.x updated: Remove remaining references to compile.source and compile.target

2022-01-24 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 078071f  Remove remaining references to compile.source and 
compile.target
078071f is described below

commit 078071fe28878462244cfc7e7257f3408445066f
Author: Mark Thomas 
AuthorDate: Mon Jan 24 14:53:50 2022 +

Remove remaining references to compile.source and compile.target

These are now unused with compile.release the effective replacement
---
 modules/jdbc-pool/build.xml| 4 
 res/ide-support/netbeans/nb-tomcat.xml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 408e890..613ff4c 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -153,8 +153,6 @@
 
@@ -193,8 +191,6 @@
 
diff --git a/res/ide-support/netbeans/nb-tomcat.xml 
b/res/ide-support/netbeans/nb-tomcat.xml
index bbcdcd4..3a0db47 100644
--- a/res/ide-support/netbeans/nb-tomcat.xml
+++ b/res/ide-support/netbeans/nb-tomcat.xml
@@ -75,7 +75,7 @@
includes="${files}"
debug="true"
deprecation="${compile.deprecation}"
-   source="${compile.source}"
+   source="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
   

-
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: Remove remaining references to compile.source and compile.target

2022-01-24 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 2fcf5ef  Remove remaining references to compile.source and 
compile.target
2fcf5ef is described below

commit 2fcf5eff33a44fc1858c1fc8eab98d039917769d
Author: Mark Thomas 
AuthorDate: Mon Jan 24 14:53:50 2022 +

Remove remaining references to compile.source and compile.target

These are now unused with compile.release the effective replacement
---
 modules/jdbc-pool/build.xml| 4 
 res/bnd/build-defaults.bnd | 4 ++--
 res/ide-support/netbeans/nb-tomcat.xml | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 2feb3a4..0381503 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -153,8 +153,6 @@
 
@@ -193,8 +191,6 @@
 
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index b7ddb81..d07caa5 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -22,8 +22,8 @@ Implementation-Title: Apache Tomcat
 Implementation-Version: ${version}
 Implementation-Vendor: Apache Software Foundation
 
-X-Compile-Source-JDK: ${compile.source}
-X-Compile-Target-JDK: ${compile.target}
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
 -includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
diff --git a/res/ide-support/netbeans/nb-tomcat.xml 
b/res/ide-support/netbeans/nb-tomcat.xml
index bbcdcd4..3a0db47 100644
--- a/res/ide-support/netbeans/nb-tomcat.xml
+++ b/res/ide-support/netbeans/nb-tomcat.xml
@@ -75,7 +75,7 @@
includes="${files}"
debug="true"
deprecation="${compile.deprecation}"
-   source="${compile.source}"
+   source="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
   

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



[tomcat] branch 10.0.x updated: Remove remaining references to compile.source and compile.target

2022-01-24 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new bab6bf8  Remove remaining references to compile.source and 
compile.target
bab6bf8 is described below

commit bab6bf88fdea1d46fad2ac50c0ebf70e3f9bd648
Author: Mark Thomas 
AuthorDate: Mon Jan 24 14:53:50 2022 +

Remove remaining references to compile.source and compile.target

These are now unused with compile.release the effective replacement
---
 modules/jdbc-pool/build.xml| 4 
 res/bnd/build-defaults.bnd | 4 ++--
 res/ide-support/netbeans/nb-tomcat.xml | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 2feb3a4..0381503 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -153,8 +153,6 @@
 
@@ -193,8 +191,6 @@
 
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index b7ddb81..d07caa5 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -22,8 +22,8 @@ Implementation-Title: Apache Tomcat
 Implementation-Version: ${version}
 Implementation-Vendor: Apache Software Foundation
 
-X-Compile-Source-JDK: ${compile.source}
-X-Compile-Target-JDK: ${compile.target}
+X-Compile-Source-JDK: ${compile.release}
+X-Compile-Target-JDK: ${compile.release}
 
 -includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
 -includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
diff --git a/res/ide-support/netbeans/nb-tomcat.xml 
b/res/ide-support/netbeans/nb-tomcat.xml
index bbcdcd4..3a0db47 100644
--- a/res/ide-support/netbeans/nb-tomcat.xml
+++ b/res/ide-support/netbeans/nb-tomcat.xml
@@ -75,7 +75,7 @@
includes="${files}"
debug="true"
deprecation="${compile.deprecation}"
-   source="${compile.source}"
+   source="${compile.release}"
encoding="ISO-8859-1"
includeantruntime="false">
   

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



[tomcat] branch main updated (bf594ed -> c744a4f)

2022-01-24 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from bf594ed  Use correct property to pass timestamp to tomcat-jdbc module
 add c744a4f  Remove remaining references to compile.source and 
compile.target

No new revisions were added by this update.

Summary of changes:
 modules/jdbc-pool/build.xml| 4 
 res/bnd/build-defaults.bnd | 4 ++--
 res/ide-support/netbeans/nb-tomcat.xml | 2 +-
 3 files changed, 3 insertions(+), 7 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: Use correct property to pass timestamp to tomcat-jdbc module

2022-01-24 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 046b7ee  Use correct property to pass timestamp to tomcat-jdbc module
046b7ee is described below

commit 046b7eea279fb4a1c58499ed275318d488fcba64
Author: Mark Thomas 
AuthorDate: Mon Jan 24 14:24:36 2022 +

Use correct property to pass timestamp to tomcat-jdbc module

Originally, reproducible builds used ant.tstamp.now.iso but that was
switched shortly after the initial commit to ant.tstamp.now but this
reference wasn't updated.
---
 build.xml  | 2 +-
 webapps/docs/changelog.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 3110753..5e69b11 100644
--- a/build.xml
+++ b/build.xml
@@ -1477,7 +1477,7 @@
 
 
-  
+  
   
   
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2e4f6fe..0a5dd08 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -1441,8 +1441,8 @@
   
 Implement the first phase of reproducible builds. Sequential builds on
 the same machine now produce identical output provided that the Ant
-property ant.tstamp.now.iso is set. The minimum required
-Ant version is now 1.9.10. (markt)
+property ant.tstamp.now is set. The minimum required Ant
+version is now 1.9.10. (markt)
   
   
 Improvements to Chinese translations. Provided by Ruan Wenjun. (mark)

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



[tomcat] branch main updated (ee9b1c6 -> bf594ed)

2022-01-24 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from ee9b1c6  Fix position of entry in changelog.xml
 add bf594ed  Use correct property to pass timestamp to tomcat-jdbc module

No new revisions were added by this update.

Summary of changes:
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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



[tomcat] branch 8.5.x updated: Remove the Java applet from the examples.

2022-01-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new eb003e6  Remove the Java applet from the examples.
eb003e6 is described below

commit eb003e6ce7942937efd54af98282a4148fba0954
Author: Mark Thomas 
AuthorDate: Thu Jan 20 22:15:56 2022 +

Remove the Java applet from the examples.

Support for applets has been removed from all mainstream browsers and
the file names were causing reproducibility problems.
---
 build.xml   |  10 --
 webapps/docs/changelog.xml  |   8 +
 webapps/examples/WEB-INF/jsp/applet/Clock2.java | 229 
 webapps/examples/jsp/index.html |   8 -
 webapps/examples/jsp/plugin/applet/Clock2.java  | 229 
 webapps/examples/jsp/plugin/plugin.html |  30 
 webapps/examples/jsp/plugin/plugin.jsp  |  34 
 7 files changed, 8 insertions(+), 540 deletions(-)

diff --git a/build.xml b/build.xml
index d8d6a22..6062337 100644
--- a/build.xml
+++ b/build.xml
@@ -1163,16 +1163,6 @@
  includeantruntime="false">
 
 
-
-
-
-
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index f172232..d16f9b6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the applet example from the example web application as applets
+are no longer supported in any major browser. (markt)
+  
+
+  
 
 
   
diff --git a/webapps/examples/WEB-INF/jsp/applet/Clock2.java 
b/webapps/examples/WEB-INF/jsp/applet/Clock2.java
deleted file mode 100644
index 128cfbd..000
--- a/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Time!
- *
- * @author Rachel Gollub
- */
-
-public class Clock2 extends Applet implements Runnable {
-private static final long serialVersionUID = 1L;
-Thread timer;// The thread that displays clock
-int lastxs, lastys, lastxm,
-lastym, lastxh, lastyh;  // Dimensions used to draw hands
-SimpleDateFormat formatter;  // Formats the date displayed
-String lastdate; // String to hold date displayed
-Font clockFaceFont;  // Font for number display on clock
-Date currentDate;// Used to get date to display
-Color handColor; // Color of main hands and dial
-Color numberColor;   // Color of second hand and numbers
-
-@Override
-public void init() {
-lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0;
-formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss ", 
Locale.getDefault());
-currentDate = new Date();
-lastdate = formatter.format(currentDate);
-clockFaceFont = new Font("Serif", Font.PLAIN, 14);
-handColor = Color.blue;
-numberColor = Color.darkGray;
-
-try {
-setBackground(new 
Color(Integer.parseInt(getParameter("bgcolor"),16)));
-} catch (Exception e) {
-// Ignore
-}
-try {
-handColor = new 
Color(Integer.parseInt(getParameter("fgcolor1"),16));
-} catch (Exception e) {
-// Ignore
-}
-try {
-numberColor = new 
Color(Integer.parseInt(getParameter("fgcolor2"),16));
-} catch (Exception e) {
-// Ignore
-}
-resize(300,300);  // Set clock window size
-}
-
-// Plotpoints allows calculation to only cover 45 degrees of the circle,
-// and then mirror
-public void plotpoints(int x0, int y0, int x, int y, Graphics g) {
-  

[tomcat] branch 9.0.x updated: Remove the Java applet from the examples.

2022-01-21 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0babfde  Remove the Java applet from the examples.
0babfde is described below

commit 0babfde22f796bb9280374622e82f1ee5f38b215
Author: Mark Thomas 
AuthorDate: Thu Jan 20 22:15:56 2022 +

Remove the Java applet from the examples.

Support for applets has been removed from all mainstream browsers and
the file names were causing reproducibility problems.
---
 build.xml   |  10 --
 webapps/docs/changelog.xml  |   8 +
 webapps/examples/WEB-INF/jsp/applet/Clock2.java | 229 
 webapps/examples/jsp/index.html |   8 -
 webapps/examples/jsp/plugin/applet/Clock2.java  | 229 
 webapps/examples/jsp/plugin/plugin.html |  30 
 webapps/examples/jsp/plugin/plugin.jsp  |  34 
 7 files changed, 8 insertions(+), 540 deletions(-)

diff --git a/build.xml b/build.xml
index baaef6c..3110753 100644
--- a/build.xml
+++ b/build.xml
@@ -1462,16 +1462,6 @@
  includeantruntime="false">
 
 
-
-
-
-
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index acea652..5cb306d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the applet example from the example web application as applets
+are no longer supported in any major browser. (markt)
+  
+
+  
   
 
   
diff --git a/webapps/examples/WEB-INF/jsp/applet/Clock2.java 
b/webapps/examples/WEB-INF/jsp/applet/Clock2.java
deleted file mode 100644
index 128cfbd..000
--- a/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Time!
- *
- * @author Rachel Gollub
- */
-
-public class Clock2 extends Applet implements Runnable {
-private static final long serialVersionUID = 1L;
-Thread timer;// The thread that displays clock
-int lastxs, lastys, lastxm,
-lastym, lastxh, lastyh;  // Dimensions used to draw hands
-SimpleDateFormat formatter;  // Formats the date displayed
-String lastdate; // String to hold date displayed
-Font clockFaceFont;  // Font for number display on clock
-Date currentDate;// Used to get date to display
-Color handColor; // Color of main hands and dial
-Color numberColor;   // Color of second hand and numbers
-
-@Override
-public void init() {
-lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0;
-formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss ", 
Locale.getDefault());
-currentDate = new Date();
-lastdate = formatter.format(currentDate);
-clockFaceFont = new Font("Serif", Font.PLAIN, 14);
-handColor = Color.blue;
-numberColor = Color.darkGray;
-
-try {
-setBackground(new 
Color(Integer.parseInt(getParameter("bgcolor"),16)));
-} catch (Exception e) {
-// Ignore
-}
-try {
-handColor = new 
Color(Integer.parseInt(getParameter("fgcolor1"),16));
-} catch (Exception e) {
-// Ignore
-}
-try {
-numberColor = new 
Color(Integer.parseInt(getParameter("fgcolor2"),16));
-} catch (Exception e) {
-// Ignore
-}
-resize(300,300);  // Set clock window size
-}
-
-// Plotpoints allows calculation to only cover 45 degrees of the circle,
-// and then mirror
-public void plotpoints(int x0, int y0, int x, int y,

[tomcat] branch 10.0.x updated: Remove the Java applet from the examples.

2022-01-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 4d437e0  Remove the Java applet from the examples.
4d437e0 is described below

commit 4d437e0b2f9b5ae61676d2643e79ef7895e1eb46
Author: Mark Thomas 
AuthorDate: Thu Jan 20 22:15:56 2022 +

Remove the Java applet from the examples.

Support for applets has been removed from all mainstream browsers and
the file names were causing reproducibility problems.
---
 build.xml   |  10 --
 webapps/docs/changelog.xml  |   8 +
 webapps/examples/WEB-INF/jsp/applet/Clock2.java | 229 
 webapps/examples/jsp/index.html |   8 -
 webapps/examples/jsp/plugin/applet/Clock2.java  | 229 
 webapps/examples/jsp/plugin/plugin.html |  30 
 webapps/examples/jsp/plugin/plugin.jsp  |  34 
 7 files changed, 8 insertions(+), 540 deletions(-)

diff --git a/build.xml b/build.xml
index fcd35b1..2568ae2 100644
--- a/build.xml
+++ b/build.xml
@@ -1480,16 +1480,6 @@
  includeantruntime="false">
 
 
-
-
-
-
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index af0c32f..cd3c9f9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the applet example from the example web application as applets
+are no longer supported in any major browser. (markt)
+  
+
+  
 
 
   
diff --git a/webapps/examples/WEB-INF/jsp/applet/Clock2.java 
b/webapps/examples/WEB-INF/jsp/applet/Clock2.java
deleted file mode 100644
index 128cfbd..000
--- a/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Time!
- *
- * @author Rachel Gollub
- */
-
-public class Clock2 extends Applet implements Runnable {
-private static final long serialVersionUID = 1L;
-Thread timer;// The thread that displays clock
-int lastxs, lastys, lastxm,
-lastym, lastxh, lastyh;  // Dimensions used to draw hands
-SimpleDateFormat formatter;  // Formats the date displayed
-String lastdate; // String to hold date displayed
-Font clockFaceFont;  // Font for number display on clock
-Date currentDate;// Used to get date to display
-Color handColor; // Color of main hands and dial
-Color numberColor;   // Color of second hand and numbers
-
-@Override
-public void init() {
-lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0;
-formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss ", 
Locale.getDefault());
-currentDate = new Date();
-lastdate = formatter.format(currentDate);
-clockFaceFont = new Font("Serif", Font.PLAIN, 14);
-handColor = Color.blue;
-numberColor = Color.darkGray;
-
-try {
-setBackground(new 
Color(Integer.parseInt(getParameter("bgcolor"),16)));
-} catch (Exception e) {
-// Ignore
-}
-try {
-handColor = new 
Color(Integer.parseInt(getParameter("fgcolor1"),16));
-} catch (Exception e) {
-// Ignore
-}
-try {
-numberColor = new 
Color(Integer.parseInt(getParameter("fgcolor2"),16));
-} catch (Exception e) {
-// Ignore
-}
-resize(300,300);  // Set clock window size
-}
-
-// Plotpoints allows calculation to only cover 45 degrees of the circle,
-// and then mirror
-public void plotpoints(int x0, int y0, int x, int y, Graphics g) {
-  

[tomcat] branch main updated: Remove the Java applet from the examples.

2022-01-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 6d98039  Remove the Java applet from the examples.
6d98039 is described below

commit 6d98039429ce3a13979c7964a747cdcd422ae864
Author: Mark Thomas 
AuthorDate: Thu Jan 20 22:15:56 2022 +

Remove the Java applet from the examples.

Support for applets has been removed from all mainstream browsers and
the file names were causing reproducibility problems.
---
 build.xml   |  10 --
 webapps/docs/changelog.xml  |   8 +
 webapps/examples/WEB-INF/jsp/applet/Clock2.java | 229 
 webapps/examples/jsp/index.html |   8 -
 webapps/examples/jsp/plugin/applet/Clock2.java  | 229 
 webapps/examples/jsp/plugin/plugin.html |  30 
 webapps/examples/jsp/plugin/plugin.jsp  |  34 
 7 files changed, 8 insertions(+), 540 deletions(-)

diff --git a/build.xml b/build.xml
index 30baa94..3042997 100644
--- a/build.xml
+++ b/build.xml
@@ -1505,16 +1505,6 @@
  includeantruntime="false">
 
 
-
-
-
-
 
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6a43a35..9ba81fb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,14 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Remove the applet example from the example web application as applets
+are no longer supported in any major browser. (markt)
+  
+
+  
 
 
   
diff --git a/webapps/examples/WEB-INF/jsp/applet/Clock2.java 
b/webapps/examples/WEB-INF/jsp/applet/Clock2.java
deleted file mode 100644
index 128cfbd..000
--- a/webapps/examples/WEB-INF/jsp/applet/Clock2.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-import java.applet.Applet;
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-/**
- * Time!
- *
- * @author Rachel Gollub
- */
-
-public class Clock2 extends Applet implements Runnable {
-private static final long serialVersionUID = 1L;
-Thread timer;// The thread that displays clock
-int lastxs, lastys, lastxm,
-lastym, lastxh, lastyh;  // Dimensions used to draw hands
-SimpleDateFormat formatter;  // Formats the date displayed
-String lastdate; // String to hold date displayed
-Font clockFaceFont;  // Font for number display on clock
-Date currentDate;// Used to get date to display
-Color handColor; // Color of main hands and dial
-Color numberColor;   // Color of second hand and numbers
-
-@Override
-public void init() {
-lastxs = lastys = lastxm = lastym = lastxh = lastyh = 0;
-formatter = new SimpleDateFormat ("EEE MMM dd hh:mm:ss ", 
Locale.getDefault());
-currentDate = new Date();
-lastdate = formatter.format(currentDate);
-clockFaceFont = new Font("Serif", Font.PLAIN, 14);
-handColor = Color.blue;
-numberColor = Color.darkGray;
-
-try {
-setBackground(new 
Color(Integer.parseInt(getParameter("bgcolor"),16)));
-} catch (Exception e) {
-// Ignore
-}
-try {
-handColor = new 
Color(Integer.parseInt(getParameter("fgcolor1"),16));
-} catch (Exception e) {
-// Ignore
-}
-try {
-numberColor = new 
Color(Integer.parseInt(getParameter("fgcolor2"),16));
-} catch (Exception e) {
-// Ignore
-}
-resize(300,300);  // Set clock window size
-}
-
-// Plotpoints allows calculation to only cover 45 degrees of the circle,
-// and then mirror
-public void plotpoints(int x0, int y0, int x, int y, Graphics g) {
-g

[tomcat] branch 8.5.x updated: Include .editorconfig in text files that need consistent line endings

2022-01-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4a1336c  Include .editorconfig in text files that need consistent line 
endings
4a1336c is described below

commit 4a1336ce6628c27fa6c53039d14445847f9d034a
Author: Mark Thomas 
AuthorDate: Thu Jan 20 09:30:36 2022 +

Include .editorconfig in text files that need consistent line endings
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 7ae0abe..d8d6a22 100644
--- a/build.xml
+++ b/build.xml
@@ -271,6 +271,7 @@
 
 
 
+
 
 
 

-
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: Include .editorconfig in text files that need consistent line endings

2022-01-21 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 74c7721  Include .editorconfig in text files that need consistent line 
endings
74c7721 is described below

commit 74c772176b423ae327287a7ad9d7e010ea7c3b44
Author: Mark Thomas 
AuthorDate: Thu Jan 20 09:30:36 2022 +

Include .editorconfig in text files that need consistent line endings
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 9db5563..baaef6c 100644
--- a/build.xml
+++ b/build.xml
@@ -277,6 +277,7 @@
 
 
 
+
 
 
 

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



[tomcat] branch 10.0.x updated: Include .editorconfig in text files that need consistent line endings

2022-01-21 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 42c7104  Include .editorconfig in text files that need consistent line 
endings
42c7104 is described below

commit 42c7104541da6350f4c4be308a606dc768bb78ff
Author: Mark Thomas 
AuthorDate: Thu Jan 20 09:30:36 2022 +

Include .editorconfig in text files that need consistent line endings
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index f8f817c..fcd35b1 100644
--- a/build.xml
+++ b/build.xml
@@ -278,6 +278,7 @@
 
 
 
+
 
 
 

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



svn commit: r52201 - in /release/tomcat/tomcat-10/v10.0.16/bin: apache-tomcat-10.0.16.tar.gz.asc apache-tomcat-10.0.16.zip.asc

2022-01-21 Thread markt
Author: markt
Date: Fri Jan 21 09:37:40 2022
New Revision: 52201

Log:
Add missing signatures

Added:
release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.tar.gz.asc   
(with props)
release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.zip.asc   (with 
props)

Added: release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.tar.gz.asc
==
--- release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.tar.gz.asc 
(added)
+++ release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.tar.gz.asc Fri 
Jan 21 09:37:40 2022
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmHizIUACgkQEMAcWi9g
+WedROw//dh+2+Kk5muHzTynholwhiFvrNz8Pzsep58liL65YNDUwhQvA8/rP+seh
+mxe2CaPx2w5/21q/pHldGNMDGWyIq3s1JyYPgaZOMZAiZHzJdteMCvGfdRIZrVFf
+d0QdeRNwLqZZvHPTq8PSt8JsBQn4c9xHYzRn5Xt8NsjOW3BBfQMIJN4jYde4o94m
+57/SCoTVg5zuhw6Xq0L2FoHRG5RSdSV90T4AYg+bUzL++1UDfk25vBLhB220KrHu
+Li+ZrlIFKe5ZJXBagTAljnVjTtki9/1x//jRPTAGDBEe3WM/nUBDR9Rzd0jZf3YC
+JZC1eA80h95xxVDPSooxaE9+MKSv4eBnnr2iK8TkbFmBD3pyCgL7V1cYVGnQNsUA
+a+mxYd4M3D5xr3VYUiHvPqCyQNWGX9mCwrbhsR7pj6JeM9yr/o8teNbsRud2aujr
+gWu0uaE+zARVnQJzXQoQQIvRqztjs1GHddToStz5zxlFDTKhpxHFYbc43IzOg9iE
+S3YolhsDpBn+b3WtDw5QAMfuuzcHJ3jBIFJu5pSIhx2RHR1UrYmxWZb1mi0X4XHR
+gb/7aa+HqO9dTjW67tVymX5Z4+gYo7SzrZt8aXA6G7gdhKG8qplzIlDwjzCQcney
+XJiprBT5VcY+TS62/JTmaOm/jxjrbzLP78CkB3jaNMsYsChNUpw=
+=cjnO
+-END PGP SIGNATURE-

Propchange: 
release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.tar.gz.asc
--
svn:executable = *

Added: release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.zip.asc
==
--- release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.zip.asc (added)
+++ release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.zip.asc Fri Jan 
21 09:37:40 2022
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Comment: GPGTools - http://gpgtools.org
+
+iQIzBAABCAAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmHizIQACgkQEMAcWi9g
+Wedvrw/+OYbNNo4imIMsBeHjUIofpxcZ5UhO1GXA36DWRNMd+rQzw+ajv3OvCKRK
+fplyYdoqSNRPI0xrfX0UdVBzBuqtcEG7iNyl14D/hKuOhVsbRDA+KZjbqwayvWJp
+tyTsCYe/v6entK25/5nvsmgFG504M+A1+P4eo4QSw71jQrpGpfUefwB9SOSL2JI6
+i4/U7KHY075C5h7OsyIdnC9hpiV5OeEclWIzQQxoSwjjPukV9PiNKYkP3zITeUWN
+0+O8BfBFsfesTwhaQKjezltHBqKZAjpRzg+DqEIOWdcRE0OmxECYR1jL6TgzyxZq
+KxlBF4v00RqoGpLhKdXazgGtzmKlkcpzWVH/mgnMrqGHBPLsSyYbFWA0Iih6acTD
+i3K0jsb4NiNJ4CI57kGtUH6jOW6Dxeoyk0jZXArEz9io0N0CApf5o7V6wRNb+Brt
+BWJMLfw7CqWK/+HGOEz96Od/3SKBcjQ8PzifDyrHgSS09klhHTWfOQ8RqgoKEeRD
+DybF7O5jgiNMrP2Hyy6Skty3it984U0T54z+8UojYFSSoh0n9g/4T5YKw47BMWRH
+MwnDqOYP8BAhW0Nq/X0hIDDfxl7mat4TELEXVNli0F/8cH5dsjRdBiqs1CdlUrO4
+ViHat+9XbejqJNzanGCXVU/VJtVDesELIDkY/TtzTyjTtUdFhZ0=
+=QIPL
+-END PGP SIGNATURE-

Propchange: release/tomcat/tomcat-10/v10.0.16/bin/apache-tomcat-10.0.16.zip.asc
--
svn:executable = *



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



svn commit: r52176 - /release/tomcat/tomcat-9/v9.0.56/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 18:38:50 2022
New Revision: 52176

Log:
Drop 9.0.56 from mirror network

Removed:
release/tomcat/tomcat-9/v9.0.56/


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



svn commit: r52175 - /release/tomcat/tomcat-10/v10.0.14/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 18:38:24 2022
New Revision: 52175

Log:
Drop 10.0.14 from mirror network

Removed:
release/tomcat/tomcat-10/v10.0.14/


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



svn commit: r1897266 - in /tomcat/site/trunk: docs/ xdocs/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 18:31:40 2022
New Revision: 1897266

URL: http://svn.apache.org/viewvc?rev=1897266=rev
Log:
Update site for 10.0.16 release

Modified:
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1897266=1897265=1897266=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Thu Jan 20 18:31:40 2022
@@ -60,8 +60,8 @@
 
   
 Latest Stable 10.0.x Release
-2021-12-08
-10.0.14
+2022-01-20
+10.0.16
   
 
 

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1897266=1897265=1897266=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Thu Jan 20 18:31:40 2022
@@ -19,7 +19,7 @@
 
   Quick Navigation
 
-[define v]10.0.14[end]
+[define v]10.0.16[end]
 [define w]10.1.0-M10[end]
 https://downloads.apache.org/tomcat/tomcat-10/KEYS;>KEYS |
 [v] |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1897266=1897265=1897266=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Jan 20 18:31:40 2022
@@ -34,6 +34,38 @@ wiki page.
 Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat
 project logo are trademarks of the Apache Software Foundation.
 
+2022-01-20 Tomcat 10.0.16 Released
+
+The Apache Tomcat Project is proud to announce the release of version 10.0.16
+of Apache Tomcat. This release implements specifications that are part of the
+Jakarta EE 9 platform.
+Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
+without changes. Java EE based applications designed for Tomcat 9 and earlier
+may be placed in the $CATALINA_BASE/webapps-javaee directory and
+Tomcat will automatically convert them to Jakarta EE and copy them to the
+webapps directory. This conversion is performed using the
+https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
+migration tool for Jakarta EE tool which is also available as a separate
+https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
+The notable changes in this release are:
+
+Add a recycling check in the input and output stream isReady to try to give
+a more informative ISE when the facade has been recycled.
+Implement support for HTTP/1.1 upgrade when the request includes a body. 
The
+maximum permitted size of the body is controlled by maxSavePostSize.
+Improve handling of various cases where one request/response processing
+thread attempts to manage the asynchronous IO for a different
+request/response 
+
+
+Full details of these changes, and all the other changes, are available in the
+Tomcat 10
+changelog.
+
+
+
+https://tomcat.apache.org/download-10.cgi;>Download
+
 2022-01-20 Tomcat 9.0.58 Released
 
 The Apache Tomcat Project is proud to announce the release of version 9.0.58
@@ -119,39 +151,6 @@ Full details of these changes, and all t
 
 
 
-https://tomcat.apache.org/download-10.cgi;>Download
-
-2021-12-08 Tomcat 10.0.14 Released
-
-The Apache Tomcat Project is proud to announce the release of version 10.0.14
-of Apache Tomcat. This release implements specifications that are part of the
-Jakarta EE 9 platform.
-Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
-without changes. Java EE based applications designed for Tomcat 9 and earlier
-may be placed in the $CATALINA_BASE/webapps-javaee directory and
-Tomcat will automatically convert them to Jakarta EE and copy them to the
-webapps directory. This conversion is performed using the
-https://github.com/apache/tomcat-jakartaee-migration;>Apache Tomcat
-migration tool for Jakarta EE tool which is also available as a separate
-https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
-The notable changes in this release are:
-
-Provide protection against a known OS bug that causes the acceptor to 
report
-an incoming connection more than once.
-Implement a workaround for a JVM bug th

svn commit: r1897262 - in /tomcat/site/trunk: ./ docs/tomcat-10.0-doc/ docs/tomcat-10.0-doc/annotationapi/ docs/tomcat-10.0-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.0-doc/annotationapi/jak

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 17:32:14 2022
New Revision: 1897262

URL: http://svn.apache.org/viewvc?rev=1897262=rev
Log:
Update docs for 10.0.16 release!


[This commit notification would consist of 83 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



svn commit: r52173 - /release/tomcat/tomcat-10/v10.1.0-M8/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 17:06:34 2022
New Revision: 52173

Log:
Drop 10.1.0-M8 from mirror network

Removed:
release/tomcat/tomcat-10/v10.1.0-M8/


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



svn commit: r1897259 - in /tomcat/site/trunk: docs/download-10.html docs/index.html docs/migration-10.1.html docs/oldnews.html docs/whichversion.html xdocs/download-10.xml xdocs/index.xml xdocs/migrat

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 16:31:40 2022
New Revision: 1897259

URL: http://svn.apache.org/viewvc?rev=1897259=rev
Log:
Update site for 10.1.0-M10 release

Modified:
tomcat/site/trunk/docs/download-10.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-10.1.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/download-10.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-10.1.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/download-10.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-10.html?rev=1897259=1897258=1897259=diff
==
--- tomcat/site/trunk/docs/download-10.html (original)
+++ tomcat/site/trunk/docs/download-10.html Thu Jan 20 16:31:40 2022
@@ -20,7 +20,7 @@
   Quick Navigation
 
 [define v]10.0.14[end]
-[define w]10.1.0-M8[end]
+[define w]10.1.0-M10[end]
 https://downloads.apache.org/tomcat/tomcat-10/KEYS;>KEYS |
 [v] |
 [w] (alpha) |

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1897259=1897258=1897259=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Jan 20 16:31:40 2022
@@ -89,11 +89,11 @@ changelog.
 
 https://tomcat.apache.org/download-80.cgi;>Download
 
-2021-12-08 Tomcat 10.0.14 Released
+2022-01-20 Tomcat 10.1.0-M10 (alpha) 
Released
 
-The Apache Tomcat Project is proud to announce the release of version 10.0.14
-of Apache Tomcat. This release implements specifications that are part of the
-Jakarta EE 9 platform.
+The Apache Tomcat Project is proud to announce the release of version 
10.1.0-M10
+of Apache Tomcat. This release is a milestone release and is targeted at 
Jakarta
+EE 10.
 Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
 without changes. Java EE based applications designed for Tomcat 9 and earlier
 may be placed in the $CATALINA_BASE/webapps-javaee directory and
@@ -104,29 +104,28 @@ migration tool for Jakarta EE tool w
 https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
 The notable changes in this release are:
 
-Provide protection against a known OS bug that causes the acceptor to 
report
-an incoming connection more than once.
-Implement a workaround for a JVM bug that can trigger a file descriptor 
leak
-when using multi-part upload and the application does not explicitly close
-an input stream for an uploaded file that was cached on disk.
-Fix exceptions when the security manager is enabled and the first request
-received after starting is an HTTP request to a TLS enabled NIO2
-connector. 
+Add a recycling check in the input and output stream isReady to try to give
+a more informative ISE when the facade has been recycled.
+Implement support for HTTP/1.1 upgrade when the request includes a body. 
The
+maximum permitted size of the body is controlled by maxSavePostSize.
+Improve handling of various cases where one request/response processing
+thread attempts to manage the asynchronous IO for a different
+request/response 
 
 
 Full details of these changes, and all the other changes, are available in the
-Tomcat 10
-changelog.
+Tomcat 10.1
+(alpha) changelog.
 
 
 
 https://tomcat.apache.org/download-10.cgi;>Download
 
-2021-12-08 Tomcat 10.1.0-M8 (alpha) Released
+2021-12-08 Tomcat 10.0.14 Released
 
-The Apache Tomcat Project is proud to announce the release of version 10.1.0-M8
-of Apache Tomcat. This release is a milestone release and is targeted at 
Jakarta
-EE 10.
+The Apache Tomcat Project is proud to announce the release of version 10.0.14
+of Apache Tomcat. This release implements specifications that are part of the
+Jakarta EE 9 platform.
 Applications that run on Tomcat 9 and earlier will not run on Tomcat 10
 without changes. Java EE based applications designed for Tomcat 9 and earlier
 may be placed in the $CATALINA_BASE/webapps-javaee directory and
@@ -137,18 +136,19 @@ migration tool for Jakarta EE tool w
 https://tomcat.apache.org/download-migration.cgi;>download for 
off-line use.
 The notable changes in this release are:
 
-Limit cookie support to RFC 6265 to align with recent updates to the 
Servlet
-specification.
-Update the WebSocket API packaging to remove the copy of the client API 
from
-the server API and replace it with a dependency on the client API. This
-aligns Tomcat with changes in the WebSocket 2.1 specification.
 Provide protection against a known OS bug that causes the acceptor to 
report
-an incoming connection more than once. 
+an incoming connection more than once.
+Implement a workaround for a J

svn commit: r1897258 - in /tomcat/site/trunk: ./ docs/tomcat-10.1-doc/ docs/tomcat-10.1-doc/annotationapi/ docs/tomcat-10.1-doc/annotationapi/jakarta/annotation/ docs/tomcat-10.1-doc/annotationapi/jak

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 16:22:45 2022
New Revision: 1897258

URL: http://svn.apache.org/viewvc?rev=1897258=rev
Log:
Update docs for 10.1.0-M10 release


[This commit notification would consist of 84 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



[tomcat] branch 10.0.x updated: Add release date for 10.0.16

2022-01-20 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new f7c720d  Add release date for 10.0.16
f7c720d is described below

commit f7c720d6a1938e9ee2994bc80e583051aa6879a2
Author: Mark Thomas 
AuthorDate: Thu Jan 20 10:57:24 2022 +

Add release date for 10.0.16
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 727de38..af0c32f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   

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



svn commit: r52167 - /dev/tomcat/tomcat-10/v10.0.16/ /release/tomcat/tomcat-10/v10.0.16/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 10:56:14 2022
New Revision: 52167

Log:
Release Apache Tomcat 10.0.16

Added:
release/tomcat/tomcat-10/v10.0.16/
  - copied from r52166, dev/tomcat/tomcat-10/v10.0.16/
Removed:
dev/tomcat/tomcat-10/v10.0.16/


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



[tomcat] branch main updated: Add release date for 10.1.0-M10

2022-01-20 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 720af73  Add release date for 10.1.0-M10
720af73 is described below

commit 720af73e970a225e68005455a0191cbea53e667a
Author: Mark Thomas 
AuthorDate: Thu Jan 20 10:52:27 2022 +

Add release date for 10.1.0-M10
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index bc6a037..6a43a35 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -106,7 +106,7 @@
 -->
 
 
-
+
   
 
   

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



svn commit: r52166 - /dev/tomcat/tomcat-10/v10.1.0-M10/ /release/tomcat/tomcat-10/v10.1.0-M10/

2022-01-20 Thread markt
Author: markt
Date: Thu Jan 20 10:46:37 2022
New Revision: 52166

Log:
Release Apache Tomcat 10.1.0-M10

Added:
release/tomcat/tomcat-10/v10.1.0-M10/
  - copied from r52165, dev/tomcat/tomcat-10/v10.1.0-M10/
Removed:
dev/tomcat/tomcat-10/v10.1.0-M10/


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



[tomcat] branch main updated: Include .editorconfig in text files that need consistent line endings

2022-01-20 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 11de0ba  Include .editorconfig in text files that need consistent line 
endings
11de0ba is described below

commit 11de0bae6933b083bd11ce488a76020683b041fe
Author: Mark Thomas 
AuthorDate: Thu Jan 20 09:30:36 2022 +

Include .editorconfig in text files that need consistent line endings
---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index c5164a5..30baa94 100644
--- a/build.xml
+++ b/build.xml
@@ -281,6 +281,7 @@
 
 
 
+
 
 
 

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



[tomcat] 01/02: Fix order to support reproducible builds

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 929a34cf8e1b9cad97324734dbfeda5a6dce3207
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:30 2022 +

Fix order to support reproducible builds
---
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index 193e777..b79473e 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -24,8 +24,7 @@ import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -108,7 +107,7 @@ public final class ObjectReflectionPropertyInspector {
 }
 
 //types of properties that IntrospectionUtils.setProperty supports
-private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new HashSet<>(
+private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new LinkedHashSet<>(
 Arrays.asList(
 Boolean.TYPE,
 Integer.TYPE,
@@ -117,7 +116,7 @@ public final class ObjectReflectionPropertyInspector {
 InetAddress.class
 )
 ));
-private static Map, SetPropertyClass> classes = new HashMap<>();
+private static Map, SetPropertyClass> classes = new 
LinkedHashMap<>();
 
 public static void generateCode(Set baseClasses, String 
packageName, File location, String className) throws Exception {
 String packageDirectory = packageName.replace('.','/');

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



[tomcat] branch 8.5.x updated: Use same options for all Javadoc tasks

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 534b884  Use same options for all Javadoc tasks
534b884 is described below

commit 534b884bd9a280c114f74590dbfed4ad1e3b6fd8
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:48 2022 +

Use same options for all Javadoc tasks
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index f5c1eb6..7ae0abe 100644
--- a/build.xml
+++ b/build.xml
@@ -1938,7 +1938,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp"
+  additionalparam="-breakiterator -notimestamp -html5"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

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



[tomcat] 01/02: Fix order to support reproducible builds

2022-01-18 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 7bc3fff66f916643c90d2947190fdc997f53176e
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:30 2022 +

Fix order to support reproducible builds
---
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index cf67e47..1d02421 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -24,8 +24,7 @@ import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -112,7 +111,7 @@ public final class ObjectReflectionPropertyInspector {
 }
 
 //types of properties that IntrospectionUtils.setProperty supports
-private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new HashSet<>(
+private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new LinkedHashSet<>(
 Arrays.asList(
 Boolean.TYPE,
 Integer.TYPE,
@@ -121,7 +120,7 @@ public final class ObjectReflectionPropertyInspector {
 InetAddress.class
 )
 ));
-private static Map, SetPropertyClass> classes = new HashMap<>();
+private static Map, SetPropertyClass> classes = new 
LinkedHashMap<>();
 
 public static void generateCode(Set baseClasses, String 
packageName, File location, String className) throws Exception {
 String packageDirectory = packageName.replace('.','/');

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



[tomcat] 02/02: Use same options for all Javadoc tasks

2022-01-18 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 dd82317446c1e3afd0d31452ee6474f5976ae590
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:48 2022 +

Use same options for all Javadoc tasks
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index b712c80..9db5563 100644
--- a/build.xml
+++ b/build.xml
@@ -2231,7 +2231,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp"
+  additionalparam="-breakiterator -notimestamp -html5"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

-
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 (a4f1d05 -> dd82317)

2022-01-18 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 a4f1d05  Align Derby version used with 10.1.x and 10.0.x
 new 7bc3fff  Fix order to support reproducible builds
 new dd82317  Use same options for all Javadoc tasks

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:
 build.xml  | 2 +-
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

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



[tomcat] 02/02: Use same options for all Javadoc tasks

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit 93c70938204aaa451f332578bec70fef1138e193
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:48 2022 +

Use same options for all Javadoc tasks
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 3759cc0..f8f817c 100644
--- a/build.xml
+++ b/build.xml
@@ -2249,7 +2249,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp"
+  additionalparam="-breakiterator -notimestamp -html5"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

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



[tomcat] 01/02: Fix order to support reproducible builds

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f0cb9b0741955a5f5b877aed2771598ec09bc44c
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:30 2022 +

Fix order to support reproducible builds
---
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index cf67e47..1d02421 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -24,8 +24,7 @@ import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -112,7 +111,7 @@ public final class ObjectReflectionPropertyInspector {
 }
 
 //types of properties that IntrospectionUtils.setProperty supports
-private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new HashSet<>(
+private static final Set> ALLOWED_TYPES = 
Collections.unmodifiableSet(new LinkedHashSet<>(
 Arrays.asList(
 Boolean.TYPE,
 Integer.TYPE,
@@ -121,7 +120,7 @@ public final class ObjectReflectionPropertyInspector {
 InetAddress.class
 )
 ));
-private static Map, SetPropertyClass> classes = new HashMap<>();
+private static Map, SetPropertyClass> classes = new 
LinkedHashMap<>();
 
 public static void generateCode(Set baseClasses, String 
packageName, File location, String className) throws Exception {
 String packageDirectory = packageName.replace('.','/');

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



[tomcat] branch 10.0.x updated (628cfd7 -> 93c7093)

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from 628cfd7  Align Derby version used with 10.1.x
 new f0cb9b0  Fix order to support reproducible builds
 new 93c7093  Use same options for all Javadoc tasks

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:
 build.xml  | 2 +-
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

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



[tomcat] 02/02: Use same options for all Javadoc tasks

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit bbab94ed3804e5df686febeb284d6a814f81824f
Author: Mark Thomas 
AuthorDate: Tue Jan 18 19:49:48 2022 +

Use same options for all Javadoc tasks
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6e5a952..c5164a5 100644
--- a/build.xml
+++ b/build.xml
@@ -2287,7 +2287,7 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp"
+  additionalparam="-breakiterator -notimestamp -html5"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

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



[tomcat] branch main updated (21aa5c0 -> bbab94e)

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


from 21aa5c0  Increment version number for next development cycle
 new 929a34c  Fix order to support reproducible builds
 new bbab94e  Use same options for all Javadoc tasks

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:
 build.xml  | 2 +-
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++
 2 files changed, 4 insertions(+), 5 deletions(-)

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



[tomcat] branch 8.5.x updated (519c1db -> 024ddaf)

2022-01-18 Thread markt
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 519c1db  Sync with 9.0.x
 new e97575e  Align with 9.0.x
 new 014f474  Update test/build libraries to as build now uses Java 11
 new a35be38  Fix IDE warning - removed unnecessary @SuppressWarnings
 new 024ddaf  Get tests building with --release=7 and newer test libraries

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   | 55 ++
 build.xml  |  6 ++-
 test/org/apache/catalina/realm/TestJNDIRealm.java  |  1 -
 .../valves/TestCrawlerSessionManagerValve.java | 20 
 test/org/apache/catalina/valves/TestSSLValve.java  |  2 +-
 5 files changed, 39 insertions(+), 45 deletions(-)

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



[tomcat] 03/04: Fix IDE warning - removed unnecessary @SuppressWarnings

2022-01-18 Thread markt
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 a35be38ceef6c2a31b171af12f2ca643f8e1aa52
Author: Mark Thomas 
AuthorDate: Tue Jan 18 11:36:47 2022 +

Fix IDE warning - removed unnecessary @SuppressWarnings
---
 test/org/apache/catalina/realm/TestJNDIRealm.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/org/apache/catalina/realm/TestJNDIRealm.java 
b/test/org/apache/catalina/realm/TestJNDIRealm.java
index 033a292..17bbae4 100644
--- a/test/org/apache/catalina/realm/TestJNDIRealm.java
+++ b/test/org/apache/catalina/realm/TestJNDIRealm.java
@@ -168,7 +168,6 @@ public class TestJNDIRealm {
 
 private NamingEnumeration mockSearchResults(String password)
 throws NamingException {
-@SuppressWarnings("unchecked")
 NamingEnumeration searchResults =
 EasyMock.createNiceMock(NamingEnumeration.class);
 EasyMock.expect(Boolean.valueOf(searchResults.hasMore()))

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



[tomcat] 04/04: Get tests building with --release=7 and newer test libraries

2022-01-18 Thread markt
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 024ddaff2cfff88e8fdf06f0db75f45bd3f8dcb1
Author: Mark Thomas 
AuthorDate: Tue Jan 18 11:37:13 2022 +

Get tests building with --release=7 and newer test libraries
---
 .../valves/TestCrawlerSessionManagerValve.java   | 20 ++--
 test/org/apache/catalina/valves/TestSSLValve.java|  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java 
b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
index 631c979..75c5d49 100644
--- a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
+++ b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
@@ -58,13 +58,13 @@ public class TestCrawlerSessionManagerValve {
 CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
 valve.setCrawlerIps("216\\.58\\.206\\.174");
 valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
-valve.setNext(EasyMock.createMock(Valve.class));
+valve.setNext((Valve) EasyMock.createMock(Valve.class));
 HttpSession session = createSessionExpectations(valve, true);
 Request request = createRequestExpectations("216.58.206.174", session, 
true);
 
 EasyMock.replay(request, session);
 
-valve.invoke(request, EasyMock.createMock(Response.class));
+valve.invoke(request, (Response) EasyMock.createMock(Response.class));
 
 EasyMock.verify(request, session);
 }
@@ -74,13 +74,13 @@ public class TestCrawlerSessionManagerValve {
 CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
 valve.setCrawlerIps("216\\.58\\.206\\.174");
 valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
-valve.setNext(EasyMock.createMock(Valve.class));
+valve.setNext((Valve) EasyMock.createMock(Valve.class));
 HttpSession session = createSessionExpectations(valve, false);
 Request request = createRequestExpectations("127.0.0.1", session, 
false);
 
 EasyMock.replay(request, session);
 
-valve.invoke(request, EasyMock.createMock(Response.class));
+valve.invoke(request, (Response) EasyMock.createMock(Response.class));
 
 EasyMock.verify(request, session);
 }
@@ -91,7 +91,7 @@ public class TestCrawlerSessionManagerValve {
 valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
 valve.setHostAware(true);
 valve.setContextAware(true);
-valve.setNext(EasyMock.createMock(Valve.class));
+valve.setNext((Valve) EasyMock.createMock(Valve.class));
 
 verifyCrawlingLocalhost(valve, "localhost");
 verifyCrawlingLocalhost(valve, "example.invalid");
@@ -103,7 +103,7 @@ public class TestCrawlerSessionManagerValve {
 valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
 valve.setHostAware(true);
 valve.setContextAware(true);
-valve.setNext(EasyMock.createMock(Valve.class));
+valve.setNext((Valve) EasyMock.createMock(Valve.class));
 
 verifyCrawlingContext(valve, "/examples");
 verifyCrawlingContext(valve, null);
@@ -114,7 +114,7 @@ public class TestCrawlerSessionManagerValve {
 CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
 valve.setCrawlerIps("216\\.58\\.206\\.174");
 valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
-valve.setNext(EasyMock.createMock(Valve.class));
+valve.setNext((Valve) EasyMock.createMock(Valve.class));
 valve.setSessionInactiveInterval(0);
 StandardSession session = new StandardSession(TEST_MANAGER);
 session.setId("id");
@@ -124,7 +124,7 @@ public class TestCrawlerSessionManagerValve {
 
 EasyMock.replay(request);
 
-valve.invoke(request, EasyMock.createMock(Response.class));
+valve.invoke(request, (Response) EasyMock.createMock(Response.class));
 
 EasyMock.verify(request);
 
@@ -143,7 +143,7 @@ public class TestCrawlerSessionManagerValve {
 
 EasyMock.replay(request, session);
 
-valve.invoke(request, EasyMock.createMock(Response.class));
+valve.invoke(request, (Response) EasyMock.createMock(Response.class));
 
 EasyMock.verify(request, session);
 }
@@ -156,7 +156,7 @@ public class TestCrawlerSessionManagerValve {
 
 EasyMock.replay(request, session);
 
-valve.invoke(request, EasyMock.createMock(Response.class));
+valve.invoke(request, (Response) EasyMock.createMock(Response.class));
 
 EasyMock.verify(request, session);
 }
diff --git a/test/org/apache/catalina/valves/TestSSLValve.java 
b/test/org/apache/catalina/va

[tomcat] 02/04: Update test/build libraries to as build now uses Java 11

2022-01-18 Thread markt
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 014f4746176c7f27cda7c04b2c6036a539c385ff
Author: Mark Thomas 
AuthorDate: Tue Jan 18 11:36:08 2022 +

Update test/build libraries to as build now uses Java 11
---
 build.properties.default | 55 +---
 build.xml|  2 +-
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index b7546d3..92c9b54 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -111,6 +111,7 @@ base-commons.loc.2=${base-apache.loc.2}/commons
 base-tomcat.loc.1=${base-apache.loc.1}/tomcat
 base-tomcat.loc.2=${base-apache.loc.2}/tomcat
 
+base-gh.loc=https://github.com
 base-sf.loc=https://downloads.sourceforge.net
 # repo.maven.apache.org is the same as repo2.maven.org
 base-maven.loc=https://repo.maven.apache.org/maven2
@@ -118,9 +119,6 @@ base-maven.loc=https://repo.maven.apache.org/maven2
 # Mirror, was used when there were problems with the main SF downloads site
 # base-sf.loc=https://sunet.dl.sourceforge.net
 
-# checkstyle-backport-jre6
-base-checkstyle.loc=https://rnveach.github.io/checkstyle-backport-jre6/maven2
-
 # - Webservices - JAX RPC -
 jaxrpc-lib.version=1.1-rc4
 jaxrpc-lib.checksum.enabled=true
@@ -237,12 +235,11 @@ hamcrest.home=${base.path}/hamcrest-${hamcrest.version}
 hamcrest.jar=${hamcrest.home}/hamcrest-${hamcrest.version}.jar
 
hamcrest.loc=${base-maven.loc}/org/hamcrest/hamcrest/${hamcrest.version}/hamcrest-${hamcrest.version}.jar
 
-# - EasyMock, version 3.6 or later -
-# 3.6 is the last version that runs on Java 7
-easymock.version=3.6
+# - EasyMock, version 3.2 or later -
+easymock.version=4.3
 easymock.checksum.enabled=true
-easymock.checksum.algorithm=SHA-512
-easymock.checksum.value=b49673e7872aa8b006d377a4ca56eed8f6e98e45ea4efe26d24cafe81ea569b557f5a326edcd387288267db8c4b59f2c3c61010f3ad01c4d1067a35430533794
+easymock.checksum.algorithm=MD5|SHA-1
+easymock.checksum.value=f4d141b8c32c022def9089ee4f890c90|b0dbe2df1a71b8115835561f46a8f06cb168a94f
 easymock.home=${base.path}/easymock-${easymock.version}
 easymock.jar=${easymock.home}/easymock-${easymock.version}.jar
 
easymock.loc=${base-maven.loc}/org/easymock/easymock/${easymock.version}/easymock-${easymock.version}.jar
@@ -257,11 +254,10 @@ cglib.jar=${cglib.home}/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 1.2 or later -
-# 2.6 is the last version that runs on Java 7
-objenesis.version=2.6
+objenesis.version=3.2
 objenesis.checksum.enabled=true
-objenesis.checksum.algorithm=SHA-512
-objenesis.checksum.value=23a593bded8cb43236faad2018b008da47bf4e29cc60c2e98fd4f2ed578fe2baddd3a98547dc14273017c82cb19ce8eaaab71d49273411856a2ba1a5d51015fc
+objenesis.checksum.algorithm=MD5|SHA-1
+objenesis.checksum.value=5c1ee20481a06561af295034ea89c4b4|7fadf57620c8b8abdf7519533e5527367cb51f09
 objenesis.home=${base.path}/objenesis-${objenesis.version}
 objenesis.jar=${objenesis.home}/objenesis-${objenesis.version}.jar
 
objenesis.loc=${base-maven.loc}/org/objenesis/objenesis/${objenesis.version}/objenesis-${objenesis.version}.jar
@@ -276,15 +272,13 @@ 
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
 
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
 
 # - Checkstyle, version 6.16 or later -
-# Checkstyle 7 requires Java 8
-# Therefore, use checkstyle-backport-jre6
-checkstyle.version=8.43
+checkstyle.version=9.2.1
 checkstyle.checksum.enabled=true
-checkstyle.checksum.algorithm=MD5|SHA-1
-checkstyle.checksum.value=e62de5cde6a85e90de1027c9c0593a99|94993f0d96460a80ba044c281872f479625a8d5a
-checkstyle.home=${base.path}/checkstyle-backport-jre6-${checkstyle.version}
+checkstyle.checksum.algorithm=SHA-512
+checkstyle.checksum.value=01f6576d988ee7ef5d7a6a528439263205c956a020c6479430992aebbe49186bb962015941161959c019daea567818b35f8cfb5157ae3b1ce1625f3699226611
+checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
 checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
-checkstyle.loc=${base-checkstyle.loc}/com/puppycrawl/tools/checkstyle-backport-jre6/${checkstyle.version}/checkstyle-backport-jre6-${checkstyle.version}-all.jar
+checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
 
 # - JaCoCo code coverage tool -
 jacoco.version=0.8.7
@@ -296,25 +290,24 @@ jacoco.jar=${jacoco.home}/lib/jacocoant.jar
 
jacoco.loc=${base-maven.loc}/org/jacoco/jacoco/${jacoco.version}/jacoco-${jacoco.version}.zip
 
 # - SpotBugs (originally FindBugs) -
-# 3.1.12 is the last

[tomcat] 01/04: Align with 9.0.x

2022-01-18 Thread markt
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 e97575e98bbd9af525015249cd8fbaff4955b372
Author: Mark Thomas 
AuthorDate: Tue Jan 18 09:44:28 2022 +

Align with 9.0.x

TLD parsing code is only used by Jasper so package it in the embedded
JAR for Jasper
---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 9faa0b9..8353131 100644
--- a/build.xml
+++ b/build.xml
@@ -92,7 +92,7 @@
   
   
 
-  
+  
   
   
   
@@ -481,11 +481,13 @@
 
 
 
+
   
 
   
 
 
+
   
 
   

-
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: Align Derby version used with 10.1.x and 10.0.x

2022-01-18 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a4f1d05  Align Derby version used with 10.1.x and 10.0.x
a4f1d05 is described below

commit a4f1d05ee6606e515a75b69e33fbbe7b77284560
Author: Mark Thomas 
AuthorDate: Tue Jan 18 09:49:39 2022 +

Align Derby version used with 10.1.x and 10.0.x
---
 build.properties.default | 13 +
 build.xml| 12 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 342a70e..f27dea5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -331,19 +331,24 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
 
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
 
 # - Derby, used by unit tests -
-derby.version=10.14.2.0
+derby.version=10.15.2.0
 
-# checksums for Derby 10.14.2.0
+# checksums for Derby 10.15.2.0
 derby.checksum.enabled=true
 derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=3ddcc1d435344d39d0122dbc2f39a746|7efad40ef52fbb1f08142f07a83b42d29e47d8ce
+derby.checksum.value=abff01351b19bc62a188bac08a8bb58b|b64da6681994f33ba5783ffae55cdb44885b9e70
+derby-shared.checksum.enabled=true
+derby-shared.checksum.algorithm=MD5|SHA-1
+derby-shared.checksum.value=2cb9ab8b9cfb06c2da5a1d3825d04344|ff2dfb3e2a92d593cf111baad242d156947abbc1
 derby-tools.checksum.enabled=true
 derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=3189a1d586f98f0d203fb5f3e5d88fbe|338d5a54b4089c80414fe0ecb3899d521da69b26
+derby-tools.checksum.value=d41578eeb336b0e479be8f30bfd9ab9b|d63722381e0e893d797e4d531e219e2917898364
 
 derby.home=${base.path}/derby-${derby.version}
 derby.jar=${derby.home}/derby-${derby.version}.jar
 
derby.loc=${base-maven.loc}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar
+derby-shared.jar=${derby.home}/derby-shared-${derby.version}.jar
+derby-shared.loc=${base-maven.loc}/org/apache/derby/derbyshared/${derby.version}/derbyshared-${derby.version}.jar
 derby-tools.jar=${derby.home}/derby-tools-${derby.version}.jar
 
derby-tools.loc=${base-maven.loc}/org/apache/derby/derbytools/${derby.version}/derbytools-${derby.version}.jar
 
diff --git a/build.xml b/build.xml
index 6ee78f6..b712c80 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
   
   
 
-  
+  
   
   
   
@@ -234,6 +234,7 @@
 
 
 
+
 
 
 
@@ -3141,6 +3142,15 @@ skip.installer property in build.properties" />
 
 
 
+  
+  
+  
+  
+  
+  
+
+
+
   
   
   

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



[tomcat] branch 10.0.x updated: Align Derby version used with 10.1.x

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 628cfd7  Align Derby version used with 10.1.x
628cfd7 is described below

commit 628cfd7c346c91c22c90a50a05e8c9b3295285c4
Author: Mark Thomas 
AuthorDate: Tue Jan 18 09:37:21 2022 +

Align Derby version used with 10.1.x
---
 build.properties.default | 13 +
 build.xml| 12 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index c8440e2..583a8dc 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -343,19 +343,24 @@ jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
 
jsign.loc=${base-maven.loc}/net/jsign/jsign/${jsign.version}/jsign-${jsign.version}.jar
 
 # - Derby, used by unit tests -
-derby.version=10.14.2.0
+derby.version=10.15.2.0
 
-# checksums for Derby 10.14.2.0
+# checksums for Derby 10.15.2.0
 derby.checksum.enabled=true
 derby.checksum.algorithm=MD5|SHA-1
-derby.checksum.value=3ddcc1d435344d39d0122dbc2f39a746|7efad40ef52fbb1f08142f07a83b42d29e47d8ce
+derby.checksum.value=abff01351b19bc62a188bac08a8bb58b|b64da6681994f33ba5783ffae55cdb44885b9e70
+derby-shared.checksum.enabled=true
+derby-shared.checksum.algorithm=MD5|SHA-1
+derby-shared.checksum.value=2cb9ab8b9cfb06c2da5a1d3825d04344|ff2dfb3e2a92d593cf111baad242d156947abbc1
 derby-tools.checksum.enabled=true
 derby-tools.checksum.algorithm=MD5|SHA-1
-derby-tools.checksum.value=3189a1d586f98f0d203fb5f3e5d88fbe|338d5a54b4089c80414fe0ecb3899d521da69b26
+derby-tools.checksum.value=d41578eeb336b0e479be8f30bfd9ab9b|d63722381e0e893d797e4d531e219e2917898364
 
 derby.home=${base.path}/derby-${derby.version}
 derby.jar=${derby.home}/derby-${derby.version}.jar
 
derby.loc=${base-maven.loc}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar
+derby-shared.jar=${derby.home}/derby-shared-${derby.version}.jar
+derby-shared.loc=${base-maven.loc}/org/apache/derby/derbyshared/${derby.version}/derbyshared-${derby.version}.jar
 derby-tools.jar=${derby.home}/derby-tools-${derby.version}.jar
 
derby-tools.loc=${base-maven.loc}/org/apache/derby/derbytools/${derby.version}/derbytools-${derby.version}.jar
 
diff --git a/build.xml b/build.xml
index 33a4fde..3759cc0 100644
--- a/build.xml
+++ b/build.xml
@@ -101,7 +101,7 @@
   
   
 
-  
+  
   
   
   
@@ -235,6 +235,7 @@
 
 
 
+
 
 
 
@@ -3169,6 +3170,15 @@ skip.installer property in build.properties" />
 
 
 
+  
+  
+  
+  
+  
+  
+
+
+
   
   
   

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



[tomcat] branch 8.5.x updated: Sync with 9.0.x

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 519c1db  Sync with 9.0.x
519c1db is described below

commit 519c1dbce3c62fcc8ebb6ebec4aec6314784cee6
Author: Mark Thomas 
AuthorDate: Tue Jan 18 09:25:27 2022 +

Sync with 9.0.x

- align configuration
- remove references to deleted code
- remove unnecessary settings
- correct version for code coverage report
---
 build.xml | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index c98a2a2..9faa0b9 100644
--- a/build.xml
+++ b/build.xml
@@ -273,8 +273,10 @@
 
 
 
+
 
 
+
 
 
 
@@ -415,7 +417,6 @@
 
 
 
-
 
 
 
@@ -585,6 +586,7 @@
 
 
 
+
 
 
 
@@ -646,7 +648,7 @@
  classname="org.apache.tomcat.buildutil.CheckEol"
  classpath="${tomcat.classes}" />
 
-
+
   
 
 
@@ -692,7 +694,6 @@
   
-  
   
   
 
@@ -1600,7 +1601,7 @@
   
 
   
-  
+  
 
   
 
@@ -2088,13 +2089,13 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
 
 
 
-
 
 
 
 
 
 
+
 
 
 

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



[tomcat] branch 8.5.x updated: Update Travis to build with Java 11

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 4cc2f1f  Update Travis to build with Java 11
4cc2f1f is described below

commit 4cc2f1f038253983faf655aeeec24b94c2d66ed6
Author: Mark Thomas 
AuthorDate: Tue Jan 18 09:07:01 2022 +

Update Travis to build with Java 11
---
 .travis.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b29aa9..72ab479 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@
 
 dist: bionic
 language: java
-jdk: oraclejdk8
+jdk: oraclejdk11
 arch: arm64
 
 addons:
@@ -34,11 +34,11 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
-- mv jdk8* jdk
+- mv jdk-11* jdk
 - export JAVA_HOME=`pwd`/jdk
 - wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.11-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
 - export ANT_HOME=`pwd`/apache-ant-1.10.11

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



[tomcat] 03/04: Parameterise the version of Java used to build Tomcat

2022-01-18 Thread markt
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 3390cb88819f89fa642e44f1463c35cddae74905
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:45:41 2022 +

Parameterise the version of Java used to build Tomcat

With the use of --release, this no longer needs to be the same as the
minimum version.
---
 BUILDING.txt | 4 ++--
 build.xml| 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 19126be..4fe3618 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,8 +35,8 @@ source distribution, do the following:
 
  1. If the JDK is already installed, skip to (2).
 
- 2. Download a version 11 of Java Development Kit (JDK) release (use the
-latest update available for your chosen version) from one of:
+ 2. Download a version @BUILD_JAVA_VERSION@ or later of Java Development Kit 
(JDK) release (use
+the latest update available for your chosen version) from one of:
 
 http://www.oracle.com/technetwork/java/javase/downloads/index.html
 http://openjdk.java.net/install/index.html
diff --git a/build.xml b/build.xml
index ec5c210..c98a2a2 100644
--- a/build.xml
+++ b/build.xml
@@ -95,6 +95,7 @@
   
   
   
+  
 
   
   
@@ -252,6 +253,7 @@
 
 
 
+
   
 
   

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



[tomcat] 02/04: Switch to building with Java 11 and using --release

2022-01-18 Thread markt
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 3b68fa6a4632592086cb9dc20118130cc7b9d16e
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:36:32 2022 +

Switch to building with Java 11 and using --release

Remove unnecessary references to compile.source and compile.target
Since we are now using release, that overrides source and target.
---
 BUILDING.txt |  2 +-
 build.xml| 79 +++-
 2 files changed, 21 insertions(+), 60 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 97a0474..19126be 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,7 +35,7 @@ source distribution, do the following:
 
  1. If the JDK is already installed, skip to (2).
 
- 2. Download a version 7 of Java Development Kit (JDK) release (use the
+ 2. Download a version 11 of Java Development Kit (JDK) release (use the
 latest update available for your chosen version) from one of:
 
 http://www.oracle.com/technetwork/java/javase/downloads/index.html
diff --git a/build.xml b/build.xml
index 4747fb0..ec5c210 100644
--- a/build.xml
+++ b/build.xml
@@ -93,8 +93,6 @@
   
 
   
-  
-  
   
   
 
@@ -205,33 +203,6 @@
   
   
 
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
   
   
 
@@ -660,8 +631,6 @@
 
@@ -715,8 +684,7 @@
 
   
-
-
+
+
 
 
 
@@ -1183,8 +1151,6 @@
 
@@ -1567,12 +1529,11 @@
   
   
 
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
 
   
 
@@ -1862,8 +1823,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -1884,8 +1845,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -1906,8 +1867,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -1928,8 +1889,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -1950,8 +1911,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -1991,8 +1952,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options} 
-J-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -XDignore.symbol.file"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

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



[tomcat] 04/04: Avoid IDE warnings when configuring Eclipse to use 11 with --release 8

2022-01-18 Thread markt
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 e2691b759119e27952c03563d0dd312061dbf95b
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:55:54 2022 +

Avoid IDE warnings when configuring Eclipse to use 11 with --release 8
---
 java/org/apache/juli/OneLineFormatter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index c2e34d8..8c663c8 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -24,7 +24,6 @@ import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.logging.Formatter;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -272,7 +271,7 @@ public class OneLineFormatter extends Formatter {
 }
 
 @Override
-protected boolean removeEldestEntry(Entry eldest) {
+protected boolean removeEldestEntry(Map.Entry eldest) 
{
 return (size() > cacheSize);
 }
 }

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



[tomcat] 01/04: Increment version for next development cycle

2022-01-18 Thread markt
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 8f3a18776d4169c61f72ae41e224dc90eacd1698
Author: Mark Thomas 
AuthorDate: Tue Jan 18 08:38:02 2022 +

Increment version for next development cycle
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 6 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index cd174df..b7546d3 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=75
+version.build=76
 version.patch=0
 version.suffix=-dev
 
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 648190d..34bd29f 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.75
+maven.asf.release.deploy.version=8.5.76
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index aa82f3d..c3f6819 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   
@@ -114,7 +116,7 @@
 
   
 
-
+
   
 
   

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



[tomcat] branch 8.5.x updated (6c71b4f -> e2691b7)

2022-01-18 Thread markt
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 6c71b4f  Fix server push. Validation will see pseudo headers so should 
allow them
 new 8f3a187  Increment version for next development cycle
 new 3b68fa6  Switch to building with Java 11 and using --release
 new 3390cb8  Parameterise the version of Java used to build Tomcat
 new e2691b7  Avoid IDE warnings when configuring Eclipse to use 11 with 
--release 8

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:
 BUILDING.txt   |  4 +-
 build.properties.default   |  2 +-
 build.xml  | 81 --
 java/org/apache/juli/OneLineFormatter.java |  3 +-
 res/maven/mvn.properties.default   |  2 +-
 webapps/docs/changelog.xml |  6 ++-
 6 files changed, 31 insertions(+), 67 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: Correct version for code coverage report

2022-01-18 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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new f08219f  Correct version for code coverage report
f08219f is described below

commit f08219ff1e385e71f16dd57bbd6a6a01f8d5e49b
Author: Mark Thomas 
AuthorDate: Tue Jan 18 08:47:35 2022 +

Correct version for code coverage report
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index f02b366..6ee78f6 100644
--- a/build.xml
+++ b/build.xml
@@ -1985,7 +1985,7 @@
   
 
   
-  
+  
 
   
 

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



[tomcat] branch 10.0.x updated: Remove unused configuration

2022-01-18 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 242b227  Remove unused configuration
242b227 is described below

commit 242b2278f456c30277a4a4157f08f2d46a519d04
Author: Mark Thomas 
AuthorDate: Tue Jan 18 08:43:53 2022 +

Remove unused configuration
---
 .github/workflows/ci.yml | 57 
 1 file changed, 57 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index e2b5177..000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-name: Smoke Test
-
-on:
-  push:
-branches:
-  - main
-  pull_request:
-branches:
-  - main
-
-env:
-  LC_ALL: en_US.UTF-8
-
-jobs:
-  JDKxx_Matrix:
-strategy:
-  fail-fast: false
-  matrix:
-java: [ 8, 11, 16, 17-ea ]
-os: [ ubuntu-latest ]
-include:
-- os: windows-latest
-  java: 8
-name: JDK${{ matrix.java }} ${{ matrix.os }}
-runs-on: ${{ matrix.os }}
-steps:
-- name: Git Checkout
-  uses: actions/checkout@v2
-- name: Set up Java
-  uses: actions/setup-java@v1
-  with:
-java-version: ${{ matrix.java }}
-- name: Build
-  run: |
-ant -noinput echoproperties deploy embed test-nio test-status
-  env:
-ANT_OPTS: -Dtest.openssl.exists=false -Dtest.excludePerformance=true 
-Dtest.exclude=**/TestHttp2Limits.java,org/apache/catalina/connector/TestRequest.java,org/apache/coyote/http11/filters/TestChunkedInputFilter.java,org/apache/catalina/startup/TestTomcat.java,org/apache/coyote/http2/TestHttp2Timeouts.java,org/apache/catalina/core/TestAsyncContextStateChanges.java,org/apache/catalina/valves/TestStuckThreadDetectionValve.java,org/apache/coyote/http11/TestHttp11Processor.java,org/ap
 [...]
-  continue-on-error:
-true
-- name: Upload logs
-  uses: actions/upload-artifact@v2
-  with:
-name: JDK${{ matrix.java }}-${{ matrix.os }}-logs
-path: output/build/logs/TEST*.txt
-retention-days: 7

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



[tomcat] 05/07: Fix typo

2022-01-17 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 20ec5d3b072f5bdf249f7f3681de600c5fa2d90d
Author: Mark Thomas 
AuthorDate: Mon Jan 17 09:29:06 2022 +

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

diff --git a/build.properties.default b/build.properties.default
index ec4e28e..342a70e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -322,7 +322,7 @@ 
osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osg
 jsign.version=4.0
 
 # checksums for JSign 4.0
-jsign.checksum.enable=true
+jsign.checksum.enabled=true
 jsign.checksum.algorithm=MD5|SHA-1
 
jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
 

-
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 (4cfdf17 -> 94b1aea)

2022-01-17 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 4cfdf17  Move on to next build
 new 455b17a  Switch to building with Java 11 and using --release
 new 0dcba00  Parameterise the version of Java used to build Tomcat
 new 807e5fc  Avoid IDE warnings when configuring Eclipse to use 11 with 
--release 8
 new 702f207  Fix building releases with Java 11. Update change log for 
Java 11 switch
 new 20ec5d3  Fix typo
 new 8abf198  Remove unnecessary option
 new 94b1aea  Switch Travis to Java 11

The 7 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:
 .travis.yml|  8 +-
 BUILDING.txt   |  4 +-
 build.properties.default   |  2 +-
 build.xml  | 86 ++
 java/org/apache/juli/OneLineFormatter.java |  3 +-
 .../ObjectReflectionPropertyInspector.java | 14 +++-
 webapps/docs/changelog.xml | 10 +++
 7 files changed, 54 insertions(+), 73 deletions(-)

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



[tomcat] 07/07: Switch Travis to Java 11

2022-01-17 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 94b1aea63ef123e996c1f9daf2cc812e1780510c
Author: Mark Thomas 
AuthorDate: Mon Jan 17 09:29:40 2022 +

Switch Travis to Java 11
---
 .travis.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b29aa9..72ab479 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@
 
 dist: bionic
 language: java
-jdk: oraclejdk8
+jdk: oraclejdk11
 arch: arm64
 
 addons:
@@ -34,11 +34,11 @@ addons:
 install:
 - ARCH=`uname -p`
 - echo $ARCH
-- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u282b08.tar.gz;
-- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz;
+- 
JDK_X64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.11_9.tar.gz;
+- 
JDK_ARM64="https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.11_9.tar.gz;
 - if test "X$ARCH" = "Xaarch64"; then JDK_URL=$JDK_ARM64; else 
JDK_URL=$JDK_X64; fi
 - wget -q $JDK_URL && tar xzf OpenJDK*.tar.gz
-- mv jdk8* jdk
+- mv jdk-11* jdk
 - export JAVA_HOME=`pwd`/jdk
 - wget -q 
https://mirrors.netix.net/apache/ant/binaries/apache-ant-1.10.11-bin.tar.gz && 
tar xzf apache-ant-*-bin.tar.gz
 - export ANT_HOME=`pwd`/apache-ant-1.10.11

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



[tomcat] 02/07: Parameterise the version of Java used to build Tomcat

2022-01-17 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 0dcba0099a1964f0953291d4cadefb5375120ebb
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:45:41 2022 +

Parameterise the version of Java used to build Tomcat

With the use of --release, this no longer needs to be the same as the
minimum version.
---
 BUILDING.txt | 4 ++--
 build.xml| 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index af3451e..43c7376 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,8 +35,8 @@ source distribution, do the following:
 
  1. If the JDK is already installed, skip to (2).
 
- 2. Download a version 11 of Java Development Kit (JDK) release (use the
-latest update available for your chosen version) from one of:
+ 2. Download a version @BUILD_JAVA_VERSION@ or later of Java Development Kit 
(JDK) release (use
+the latest update available for your chosen version) from one of:
 
 http://www.oracle.com/technetwork/java/javase/downloads/index.html
 http://openjdk.java.net/install/index.html
diff --git a/build.xml b/build.xml
index 4e88511..f8bc7df 100644
--- a/build.xml
+++ b/build.xml
@@ -104,6 +104,7 @@
   
   
   
+  
 
   
   
@@ -256,6 +257,7 @@
 
 
 
+
   
 
   

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



[tomcat] 04/07: Fix building releases with Java 11. Update change log for Java 11 switch

2022-01-17 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 702f2076574c3989ccb402d2cb664097d6600ee3
Author: Mark Thomas 
AuthorDate: Thu Jan 13 19:42:16 2022 +

Fix building releases with Java 11. Update change log for Java 11 switch
---
 .../xreflection/ObjectReflectionPropertyInspector.java | 14 +-
 webapps/docs/changelog.xml | 10 ++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index 514aeb4..cf67e47 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -147,9 +147,21 @@ public final class ObjectReflectionPropertyInspector {
 (method.getParameterTypes() == null ||
 method.getParameterTypes().length == 0) &&
 ALLOWED_TYPES.contains(method.getReturnType()) &&
-!Modifier.isPrivate(method.getModifiers());
+!Modifier.isPrivate(method.getModifiers()) &&
+isPresentInJava8Api(method);
 }
 
+private static boolean isPresentInJava8Api(Method method) {
+// Up to Java 18 EA 30 this was the only problematic method so this
+// approach is OK. If we get more than a few of these this code may
+// need to be refactored.
+if (ClassLoader.class.isAssignableFrom(method.getDeclaringClass())) {
+if ("getName".equals(method.getName())) {
+return false;
+}
+}
+return true;
+}
 
 private static SetPropertyClass getOrCreateSetPropertyClass(Class 
clazz) {
 boolean base = (clazz.getSuperclass() == null || clazz.getSuperclass() 
== Object.class);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 828f33d..109bb9c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,6 +105,16 @@
   issues do not "pop up" wrt. others).
 -->
 
+  
+
+  
+Switch to building with Java 11 and using --release to
+target Java 8. Once back-ported to all currently supported branches,
+this will reduce the number of Java versions developers need to juggle.
+(markt)
+  
+
+  
 
 
   

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



[tomcat] 03/07: Avoid IDE warnings when configuring Eclipse to use 11 with --release 8

2022-01-17 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 807e5fc7323ddcea5e60bf555a0c716196b476ba
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:55:54 2022 +

Avoid IDE warnings when configuring Eclipse to use 11 with --release 8
---
 java/org/apache/juli/OneLineFormatter.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/java/org/apache/juli/OneLineFormatter.java 
b/java/org/apache/juli/OneLineFormatter.java
index 3f1e4f6..7419d8b 100644
--- a/java/org/apache/juli/OneLineFormatter.java
+++ b/java/org/apache/juli/OneLineFormatter.java
@@ -24,7 +24,6 @@ import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.logging.Formatter;
 import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
@@ -263,7 +262,7 @@ public class OneLineFormatter extends Formatter {
 }
 
 @Override
-protected boolean removeEldestEntry(Entry eldest) {
+protected boolean removeEldestEntry(Map.Entry eldest) 
{
 return (size() > cacheSize);
 }
 }

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



[tomcat] 01/07: Switch to building with Java 11 and using --release

2022-01-17 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 455b17aa308c8ddffc6c493f74379bc87a18f067
Author: Mark Thomas 
AuthorDate: Thu Jan 13 16:36:32 2022 +

Switch to building with Java 11 and using --release

Remove unnecessary references to compile.source and compile.target
Since we are now using release, that overrides source and target.
---
 BUILDING.txt |  2 +-
 build.xml| 83 +++-
 2 files changed, 22 insertions(+), 63 deletions(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 8ee2637..af3451e 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,7 +35,7 @@ source distribution, do the following:
 
  1. If the JDK is already installed, skip to (2).
 
- 2. Download a version 8 of Java Development Kit (JDK) release (use the
+ 2. Download a version 11 of Java Development Kit (JDK) release (use the
 latest update available for your chosen version) from one of:
 
 http://www.oracle.com/technetwork/java/javase/downloads/index.html
diff --git a/build.xml b/build.xml
index a51cbfb..4e88511 100644
--- a/build.xml
+++ b/build.xml
@@ -102,8 +102,6 @@
   
 
   
-  
-  
   
   
 
@@ -211,33 +209,6 @@
   
   
 
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
   
   
 
@@ -915,8 +886,6 @@
 
@@ -970,8 +939,7 @@
 
   
-
-
+
+
 
 
 
@@ -1485,8 +1453,6 @@
 
   
@@ -1821,8 +1784,6 @@
 
@@ -1951,13 +1912,11 @@
   
   
   
-
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
 
   
 
@@ -2164,8 +2123,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -2186,8 +2145,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -2207,8 +2166,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -2228,8 +2187,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -2249,8 +2208,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">
@@ -2289,8 +2248,8 @@ Apache Tomcat ${version} native binaries for Win64 
AMD64/EMT64 platform.
   encoding="UTF-8"
   docencoding="UTF-8"
   charset="UTF-8"
-  additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
-  source="${compile.source}"
+  additionalparam="-breakiterator -notimestamp -html5"
+  source="${compile.release}"
   maxmemory="512m"
   failonerror="true"
   failonwarning="true">

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



[tomcat] 06/07: Remove unnecessary option

2022-01-17 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 8abf1984b72343392b5d24a8397c6ac1138552f3
Author: Mark Thomas 
AuthorDate: Mon Jan 17 09:29:22 2022 +

Remove unnecessary option
---
 build.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.xml b/build.xml
index f8bc7df..f02b366 100644
--- a/build.xml
+++ b/build.xml
@@ -947,7 +947,6 @@
   
-  
   
 
 

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



  1   2   3   4   5   6   7   8   9   10   >