[GitHub] [tomcat] chenyonghui opened a new pull request #468: add test sub targets depend on setup-jacoco
chenyonghui opened a new pull request #468: URL: https://github.com/apache/tomcat/pull/468 if run test-* targets,eg ant test-nio, get errors build.xml:1896: Problem: failed to create task or type antlib:org.jacoco.ant:coverage -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 65848] 3a4c7bf2513a6f3e52d9608f3855d5f8148fef48 introduces regression with cert-based authentication
https://bz.apache.org/bugzilla/show_bug.cgi?id=65848 --- Comment #2 from Michael Osipov --- Yet another problem is that the changelog entry does not really represent the change in behavior. I guess we need to reproduce the same "Compatibility and Stability warning" block as mod_ssl. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 04/07: Reproducibility for tomcat-jdbc when built as part of Tomcat
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
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)
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
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
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-virtual-webapp/src/main/webapp-b/WEB-INF/classes");
File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
-File f6 = new File("test/webapp-virtual-webapp/sr
[tomcat] 01/07: Reproducible builds: Consistent line endings in text files in JAR manifests
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
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)
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-webapp/src/main/{webapp2 =>
webapp-b}/WEB-INF/classes/rsrc/resourceG.properties (100%)
rename test/webapp-virtual
[Bug 65848] 3a4c7bf2513a6f3e52d9608f3855d5f8148fef48 introduces regression with cert-based authentication
https://bz.apache.org/bugzilla/show_bug.cgi?id=65848 --- Comment #1 from Remy Maucherat --- When the possibility exists, the regular configuration should be used otherwise there will always be problems. The doc there https://httpd.apache.org/docs/trunk/mod/mod_ssl.html#sslopensslconfcmd also says it is going to be a mess since there is config duplication. Looking at https://www.openssl.org/docs/man1.1.1/man3/SSL_CONF_cmd.html, it is possible to identify some commands that would accurately indicate that CA is being configured, including ChainCAFile, ChainCAPath, VerifyCAFile, VerifyCAPath, RequestCAFile. In that case the reject callback would not be set. But having to do and maintain that special handling is annoying, and calls for more special cases. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 07/08: Add note about changes for text files in JARs
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
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-virtual-webapp/src/main/webapp-b/WEB-INF/classes");
File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
-File f6 = new File("test/webapp-virtual-webapp/sr
[tomcat] 01/08: Reproducible builds: Consistent line endings in text files in JAR manifests
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
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)
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
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
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
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,7 @@ Export-Package: \
-includepackage:
[tomcat] branch 9.0.x updated (2fcf5ef -> 518b49b)
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/webapp-virtual-webapp/src/main/{webapp =>
webapp-a}/contextGetResource.jsp (100%)
rename test
[tomcat] 08/08: Silence a dependabot nag (it is a test dependency)
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
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
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
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
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
@@ -35,7 +35,7 @@ Export-Package: \
-inclu
[tomcat] 03/08: Refactor to avoid reproducibility issues due to zip task ordering
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");
File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
-File f6 = new File("test/webapp-virtual-webapp/src/main/webapp2");
+File f6 = new File("test/webapp
[tomcat] 04/08: Reproducible builds: text files in JARs
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
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)
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/webapp-virtual-webapp/src/main/{webapp =>
webapp-a}/contextGetResource.jsp (100%)
rename
[tomcat] branch main updated: Silence a dependabot nag (it is a test dependency)
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
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
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
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
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
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
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
@@ -35,7 +35,7 @@ Export-Package: \
-include
[tomcat] 03/07: Refactor to avoid reproducibility issues due to zip task ordering
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");
File f5 = new File("test/webapp-virtual-webapp/src/main/misc");
-File f6 = new File("test/webapp-virtual-webapp/src/main/webapp2");
+File f6 = new File("test/webapp-v
[tomcat] branch main updated (52f627e -> 841b4b9)
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}/contextGetResourcePaths.jsp (100%)
rename test/webapp-virtual-webapp/src/main/{webapp =>
webapp-a}/rsrc/resourceF.p
Re: Reproducible builds update
Hey Mark,
bnd is in ramp down phase targetting a release in Feb so if you do find an
issue soon-ish we can work to get it in the release.
Ray
On Wed, Jan 26, 2022 at 4:05 AM Mark Thomas wrote:
> I have made some progress on this over the last few days. The current
> status is:
>
> - Builds are reproducible (excluding signing of Windows binaries) when
>using the same OS / Java / Ant combination.
>
> - JSign gives us what we need to handling the signing of the Windows
>binaries. "Just" need to implement it.
>
> - No solution yet for the zipped JSON files created by the Javadoc tool.
>This is low priority. If we decide to address it, the short-term fix
>will be to unpack and rebuild the zip. The long term fix will be to
>get the Javadoc tool changed.
>
> - The Ant archive cross-platform ordering issues (".../..." vs
>"...\...") have been worked around with some renaming. The long term
>fix is to address this in Ant.
>
> - I think there is another BND issue. I've seen one instance of
>module-info.class being generated differently. I'm not sure if this is
>a pure BND issue or if cross-platform builds were a factor.
>
> - I have also seen one issue where XReflectionIntrospectionUtils.class
>was generated differently. I haven't looked into that yet.
>
>
> I have a few commits to push to improve cross-platform reproducibility.
> One is for the Ant archive ordering issue. The rest are various LF vs
> CRLF issues.
>
> My plan is to push these changes and back-port them - probably later today.
>
> I intend to continue working on making the Tomcat build reproducible
> cross-platform but I anticipate that this work will be on the
> back-burner for a while as I have a couple of other things I want to
> look at first.
>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>
--
*Raymond Augé* (@rotty3000)
Senior Software Architect *Liferay, Inc.* (@Liferay)
OSGi Fellow, Java Champion
[Bug 65848] New: 3a4c7bf2513a6f3e52d9608f3855d5f8148fef48 introduces regression with cert-based authentication
https://bz.apache.org/bugzilla/show_bug.cgi?id=65848
Bug ID: 65848
Summary: 3a4c7bf2513a6f3e52d9608f3855d5f8148fef48 introduces
regression with cert-based authentication
Product: Tomcat 8
Version: 8.5.75
Hardware: All
OS: All
Status: NEW
Severity: regression
Priority: P2
Component: Util
Assignee: dev@tomcat.apache.org
Reporter: micha...@apache.org
Target Milestone:
Pure Tomcat upgrade from 8.5.73 to .75 rejects all client certificates with the
following configuration:
> keepAliveTimeout="720"
> maxHttpHeaderSize="24576" maxThreads="250"
> SSLEnabled="true" scheme="https" secure="true"
> defaultSSLHostConfigName="deblndw028v.ad001.siemens.net">
> protocols="TLSv1.2+TLSv1.3"
> honorCipherOrder="true" disableSessionTickets="true"
> certificateVerification="optional"
> certificateVerificationDepth="5"
>
> ciphers="HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK:!DSS:!SHA1:!SHA256:!SHA384">
> certificateFile="/opt/openssl/deblndw028v.ad001.siemens.net/cert.crt"
>
> certificateKeyFile="/opt/openssl/deblndw028v.ad001.siemens.net/key.crt"
> certificateKeyPassword="..." type="RSA" />
>
> value="/opt/openssl/certs" />
> value="/opt/openssl/siemens-medium+strong-clientcert-cacerts.crt" />
>
>
>
>
I am using the conf command for consistency reasons because our OpenSSL wrapper
does not offer SSLCADNRequestFile/SSLCADNRequestPath and did not want to mix
config styles.
Now 3a4c7bf2513a6f3e52d9608f3855d5f8148fef48 does:
> +if (sslHostConfig.getCaCertificateFile() == null &&
> sslHostConfig.getCaCertificatePath(
> ) == null) {
> +// No CA certificates configured. Reject all client
> certificates.
> +SSLContext.setCertVerifyCallback(ctx, new
> CertificateVerifier() {
> +@Override
> +public boolean verify(long ssl, byte[][] chain,
> String auth) {
> +return false;
> +}
> +});
This is too shortsighted since it does not take the conf command into account.
Another issue is that this is inconsistent. I have set up the same case with
HTTPd and mod_ssl and both Schannel and NSS give me the follwing:
* Schannel: curl: (60) schannel: SEC_E_UNTRUSTED_ROOT (0x80090325) - Die
Zertifikatkette wurde von einer nicht vertrauenswürdigen Zertifizierungsstelle
ausgestellt.
* NSS: SSL_ERROR_UNKNOWN_CA_ALERT
I haven't yet checked mod_ssl code for this.
Error log:
> 66233 [Wed Jan 26 14:28:43.071310 2022] [ssl:error] [pid 61976] [client
> 139.21.146.172:33249] AH02039: Certificate Verification: Error (20): unable
> to get local issuer certificate
> 66234 [Wed Jan 26 14:28:43.071442 2022] [ssl:warn] [pid 61976] [client
> 139.21.146.172:33249] AH02227: Failed to set r->user to
> 'SSL_CLIENT_SAN_OTHER_msUPN_0'
> 66235 [Wed Jan 26 14:28:43.071487 2022] [core:error] [pid 61976] [client
> 139.21.146.172:33249] AH00027: No authentication done but request not allowed
> without authentication for /~osipovmi/tls-auth/index.php. Au
> 66240 [Wed Jan 26 14:30:45.391914 2022] [ssl:error] [pid 62030] [client
> 139.21.146.172:42111] AH02039: Certificate Verification: Error (20): unable
> to get local issuer certificate
> 66241 [Wed Jan 26 14:30:45.392025 2022] [ssl:error] [pid 62030] [client
> 139.21.146.172:42111] AH02261: Re-negotiation handshake failed
with new broken setup I get:
* schannel: next InitializeSecurityContext failed: SEC_E_ILLEGAL_MESSAGE
(0x80090326) - This error usually occurs when a fatal SSL/TLS alert is received
(e.g. handshake failed). More detail may be available in the Windows System
event log.
* NSS: SSL_ERROR_UNKNOWN_CA_ALERT
I need to check Wireshark packets and compare.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update version numbers
This is an automated email from the ASF dual-hosted git repository. remm 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 52f627e Update version numbers 52f627e is described below commit 52f627ee0b2867c5597251ee7982b458783efae4 Author: remm AuthorDate: Wed Jan 26 13:24:35 2022 +0100 Update version numbers Graal dropped support for Java 8 and trying Tomcat 10.1 also causes problems, so move up to 11 for the example script. --- modules/stuffed/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/stuffed/pom.xml b/modules/stuffed/pom.xml index 128be6e..634c768 100644 --- a/modules/stuffed/pom.xml +++ b/modules/stuffed/pom.xml @@ -29,8 +29,8 @@ UTF-8 org.apache.catalina.startup.Tomcat -10.0.14 - +10.0.16 + @@ -79,8 +79,8 @@ maven-compiler-plugin 3.8.1 -1.8 -1.8 +11 +11 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[SECURITY] CVE-2022-23181 Apache Tomcat Local Privilege Escalation
CVE-2022-23181 Apache Tomcat Local Privilege Escalation Severity: Low Vendor: The Apache Software Foundation Versions Affected: Apache Tomcat 10.1.0-M1 to 10.1.0-M8 Apache Tomcat 10.0.0-M5 to 10.0.14 Apache Tomcat 9.0.35 to 9.0.56 Apache Tomcat 8.5.55 to 8.5.73 Description: The fix for bug 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 using the FileStore. Mitigation: Users of the affected versions should apply one of the following mitigations: - Upgrade to Apache Tomcat 10.1.0-M10 or later - Upgrade to Apache Tomcat 10.0.16 or later - Upgrade to Apache Tomcat 9.0.58 or later - Upgrade to Apache Tomcat 8.5.75 or later Note: This issue was fixed in Apache Tomcat 10.1.0-M9, 10.0.15, 9.0.57 and 8.5.74 but the release vote for those release candidates did not pass. Therefore, although users must download 10.1.0-M10, 10.0.16, 9.0.58 or 8.5.75 to obtain a version that includes a fix for this issue, versions 10.1.0-M9, 10.0.15, 9.0.57 and 8.5.74 are not included in the list of affected versions. History: 2022-01-26 Original advisory Credit: This issue was reported to the Apache Tomcat Security team by Trung Pham of Viettel Cyber Security. References: [1] https://tomcat.apache.org/security-10.html [2] https://tomcat.apache.org/security-9.html [3] https://tomcat.apache.org/security-8.html - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
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
Author: markt Date: Wed Jan 26 11:10:26 2022 New Revision: 1897496 URL: http://svn.apache.org/viewvc?rev=1897496&view=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&r1=1897495&r2=1897496&view=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 Tomcat®https://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 + using the FileStore. + +This was fixed with commit + https://github.com/apache/tomcat/commit/094800b12d6c958d7b4540372c5a95
Re: Reproducible builds update
I have made some progress on this over the last few days. The current
status is:
- Builds are reproducible (excluding signing of Windows binaries) when
using the same OS / Java / Ant combination.
- JSign gives us what we need to handling the signing of the Windows
binaries. "Just" need to implement it.
- No solution yet for the zipped JSON files created by the Javadoc tool.
This is low priority. If we decide to address it, the short-term fix
will be to unpack and rebuild the zip. The long term fix will be to
get the Javadoc tool changed.
- The Ant archive cross-platform ordering issues (".../..." vs
"...\...") have been worked around with some renaming. The long term
fix is to address this in Ant.
- I think there is another BND issue. I've seen one instance of
module-info.class being generated differently. I'm not sure if this is
a pure BND issue or if cross-platform builds were a factor.
- I have also seen one issue where XReflectionIntrospectionUtils.class
was generated differently. I haven't looked into that yet.
I have a few commits to push to improve cross-platform reproducibility.
One is for the Ant archive ordering issue. The rest are various LF vs
CRLF issues.
My plan is to push these changes and back-port them - probably later today.
I intend to continue working on making the Tomcat build reproducible
cross-platform but I anticipate that this work will be on the
back-burner for a while as I have a couple of other things I want to
look at first.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
