You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/01/26 17:05:29 UTC
[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-webapp/src/main/{webapp2/rsrc2 => webapp-b/rsrc-2}/resourceJ.properties (100%)
rename test/webapp-virtual-webapp/src/main/{webapp2 => webapp-b}/rsrc/resourceF.properties (92%)
rename test/webapp-virtual-webapp/src/main/{webapp2 => webapp-b}/rsrc/resourceH.properties (100%)
rename webapps/examples/WEB-INF/{jsp2 => jsp}/jsp2-example-taglib.tld (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/07: Reproducible builds: Consistent line endings in text files in JAR manifests
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a440261817a71cfccb6a914b852f257904df5726
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 24 10:23:14 2022 +0000
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 @@
<filterset refid="version.filters"/>
<fileset dir="${tomcat.home}/res/META-INF" />
</copy>
+
+ <!-- Ensure text files in JARs have consistent line endings. Required for
+ reproducible builds. -->
+ <fixcrlf srcdir="${tomcat.manifests}" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset refid="text.files" />
+ </fixcrlf>
</target>
<target name="package" depends="compile,build-manifests" >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/07: Refactor to avoid reproducibility issues due to zip task ordering
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a1a805118b4e8dac12c820501be67db7a69c6af5
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jan 20 20:00:58 2022 +0000
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/src/main/webapp2");
+ File f6 = new File("test/webapp-virtual-webapp/src/main/webapp-b");
ctx.getResources().createWebResourceSet(
WebResourceRoot.ResourceSetType.POST, "/WEB-INF/classes",
f1.getAbsolutePath(), null, "/");
@@ -143,13 +143,13 @@ public class TestVirtualContext extends TomcatBaseTest {
"/test/classpathGetResources.jsp?path=rsrc/").toString();
Assert.assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes/rsrc") > 0);
Assert.assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc") > 0);
Assert.assertTrue(
allUrls,
- allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
+ allUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/lib/rsrc.jar!/rsrc") > 0);
Assert.assertTrue(
allUrls,
allUrls.indexOf("/test/webapp-virtual-webapp/target/classes/rsrc") > 0);
@@ -165,10 +165,10 @@ public class TestVirtualContext extends TomcatBaseTest {
String allRsrsc2ClasspathUrls =
getUrl(
"http://localhost:" + getPort() +
- "/test/classpathGetResources.jsp?path=rsrc2/").toString();
+ "/test/classpathGetResources.jsp?path=rsrc-2/").toString();
Assert.assertTrue(
allRsrsc2ClasspathUrls,
- allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2") > 0);
+ allRsrsc2ClasspathUrls.indexOf("/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc-2") > 0);
// tests context.getRealPath
@@ -180,7 +180,7 @@ public class TestVirtualContext extends TomcatBaseTest {
// Real paths depend on the OS and this test has to work on all
// platforms so use File to convert the path to a platform specific form
File f = new File(
- "test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties");
+ "test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties");
assertPageContains(
"/test/contextGetRealPath.jsp?path=/rsrc/resourceF.properties",
f.getPath());
@@ -202,7 +202,7 @@ public class TestVirtualContext extends TomcatBaseTest {
"/test/contextGetResource.jsp?path=/other/resourceI.properties",
"resourceIInWebapp=true");
assertPageContains(
- "/test/contextGetResource.jsp?path=/rsrc2/resourceJ.properties",
+ "/test/contextGetResource.jsp?path=/rsrc-2/resourceJ.properties",
"resourceJInWebapp=true");
String allRsrcPaths =
@@ -227,10 +227,10 @@ public class TestVirtualContext extends TomcatBaseTest {
String allRsrc2Paths =
getUrl(
"http://localhost:" + getPort() +
- "/test/contextGetResourcePaths.jsp?path=/rsrc2/").toString();
+ "/test/contextGetResourcePaths.jsp?path=/rsrc-2/").toString();
Assert.assertTrue(
allRsrc2Paths,
- allRsrc2Paths.indexOf("/rsrc2/resourceJ.properties") > 0);
+ allRsrc2Paths.indexOf("/rsrc-2/resourceJ.properties") > 0);
assertPageContains(
"/test/testTlds.jsp",
@@ -250,7 +250,7 @@ public class TestVirtualContext extends TomcatBaseTest {
public void testAdditionalWebInfClassesPaths() 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());
diff --git a/test/webapp-servletsecurity/WEB-INF/web.xml b/test/webapp-servletsecurity-a/WEB-INF/web.xml
similarity index 100%
rename from test/webapp-servletsecurity/WEB-INF/web.xml
rename to test/webapp-servletsecurity-a/WEB-INF/web.xml
diff --git a/test/webapp-servletsecurity2/WEB-INF/web.xml b/test/webapp-servletsecurity-b/WEB-INF/web.xml
similarity index 100%
rename from test/webapp-servletsecurity2/WEB-INF/web.xml
rename to test/webapp-servletsecurity-b/WEB-INF/web.xml
diff --git a/test/webapp-servletsecurity2/protected.jsp b/test/webapp-servletsecurity-b/protected.jsp
similarity index 100%
rename from test/webapp-servletsecurity2/protected.jsp
rename to test/webapp-servletsecurity-b/protected.jsp
diff --git a/test/webapp-servletsecurity2/unprotected.jsp b/test/webapp-servletsecurity-b/unprotected.jsp
similarity index 100%
rename from test/webapp-servletsecurity2/unprotected.jsp
rename to test/webapp-servletsecurity-b/unprotected.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/A.tld b/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/A.tld
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/WEB-INF/A.tld
rename to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/A.tld
diff --git a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties b/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes/rsrc/resourceA.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/WEB-INF/classes/rsrc/resourceA.properties
rename to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/classes/rsrc/resourceA.properties
diff --git a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar b/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/lib/rsrc.jar
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/WEB-INF/lib/rsrc.jar
rename to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/lib/rsrc.jar
diff --git a/test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml b/test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/web.xml
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/WEB-INF/web.xml
rename to test/webapp-virtual-webapp/src/main/webapp-a/WEB-INF/web.xml
diff --git a/test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResourceAsStream.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceAsStream.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResourceAsStream.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResourceUrlThenGetStream.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/classpathGetResourceUrlThenGetStream.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResourceUrlThenGetStream.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/classpathGetResources.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResources.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/classpathGetResources.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/classpathGetResources.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/contextGetRealPath.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/contextGetRealPath.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/contextGetRealPath.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/contextGetRealPath.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/contextGetResource.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/contextGetResource.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/contextGetResource.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/contextGetResource.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/contextGetResourcePaths.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/contextGetResourcePaths.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/contextGetResourcePaths.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties b/test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties
rename to test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties
diff --git a/test/webapp-virtual-webapp/src/main/webapp/testTlds.jsp b/test/webapp-virtual-webapp/src/main/webapp-a/testTlds.jsp
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp/testTlds.jsp
rename to test/webapp-virtual-webapp/src/main/webapp-a/testTlds.jsp
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/D.tld b/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/D.tld
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/D.tld
rename to test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/D.tld
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties b/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc-2/resourceK.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc2/resourceK.properties
rename to test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc-2/resourceK.properties
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties b/test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc/resourceG.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp2/WEB-INF/classes/rsrc/resourceG.properties
rename to test/webapp-virtual-webapp/src/main/webapp-b/WEB-INF/classes/rsrc/resourceG.properties
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties b/test/webapp-virtual-webapp/src/main/webapp-b/rsrc-2/resourceJ.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp2/rsrc2/resourceJ.properties
rename to test/webapp-virtual-webapp/src/main/webapp-b/rsrc-2/resourceJ.properties
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties b/test/webapp-virtual-webapp/src/main/webapp-b/rsrc/resourceF.properties
similarity index 92%
rename from test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
rename to test/webapp-virtual-webapp/src/main/webapp-b/rsrc/resourceF.properties
index 9e4fa83..8484819 100644
--- a/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceF.properties
+++ b/test/webapp-virtual-webapp/src/main/webapp-b/rsrc/resourceF.properties
@@ -14,4 +14,4 @@
# limitations under the License.
This file should not be served, it is masked by
-/test/webapp-virtual-webapp/src/main/webapp/rsrc/resourceF.properties
\ No newline at end of file
+/test/webapp-virtual-webapp/src/main/webapp-a/rsrc/resourceF.properties
\ No newline at end of file
diff --git a/test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties b/test/webapp-virtual-webapp/src/main/webapp-b/rsrc/resourceH.properties
similarity index 100%
rename from test/webapp-virtual-webapp/src/main/webapp2/rsrc/resourceH.properties
rename to test/webapp-virtual-webapp/src/main/webapp-b/rsrc/resourceH.properties
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e45bf33..e1e9960 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -120,6 +120,11 @@
Remove the applet example from the example web application as applets
are no longer supported in any major browser. (markt)
</fix>
+ <scode>
+ Refactor a small number of pages in the examples web application to
+ avoid an issue with reproducible builds due to differences in file
+ ordering across different operating systems with Ant's zip task. (markt)
+ </scode>
</changelog>
</subsection>
</section>
diff --git a/webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld b/webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld
similarity index 100%
rename from webapps/examples/WEB-INF/jsp2/jsp2-example-taglib.tld
rename to webapps/examples/WEB-INF/jsp/jsp2-example-taglib.tld
diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index 1a823a5..ff394c0 100644
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -231,7 +231,7 @@
http://tomcat.apache.org/jsp2-example-taglib
</taglib-uri>
<taglib-location>
- /WEB-INF/jsp2/jsp2-example-taglib.tld
+ /WEB-INF/jsp/jsp2-example-taglib.tld
</taglib-location>
</taglib>
diff --git a/webapps/examples/jsp/jsp2/simpletag/book.jsp b/webapps/examples/jsp/jsp2/simpletag/book.jsp
index ba07cfb..4cce650 100644
--- a/webapps/examples/jsp/jsp2/simpletag/book.jsp
+++ b/webapps/examples/jsp/jsp2/simpletag/book.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="my" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="my" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
<html>
<head>
<title>JSP 2.0 Examples - Book SimpleTag Handler</title>
diff --git a/webapps/examples/jsp/jsp2/simpletag/hello.jsp b/webapps/examples/jsp/jsp2/simpletag/hello.jsp
index d9f22a2..408c216 100644
--- a/webapps/examples/jsp/jsp2/simpletag/hello.jsp
+++ b/webapps/examples/jsp/jsp2/simpletag/hello.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="mytag" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
<html>
<head>
<title>JSP 2.0 Examples - Hello World SimpleTag Handler</title>
diff --git a/webapps/examples/jsp/jsp2/simpletag/repeat.jsp b/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
index b12d0a9..234360f 100644
--- a/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
+++ b/webapps/examples/jsp/jsp2/simpletag/repeat.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
+<%@ taglib prefix="mytag" uri="/WEB-INF/jsp/jsp2-example-taglib.tld" %>
<html>
<head>
<title>JSP 2.0 Examples - Repeat SimpleTag Handler</title>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/07: Reproducible builds: text files in JARs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 25b07bd75c932907c8d011dd5afe244a0f8983d2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 24 11:13:33 2022 +0000
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 -->
<native2ascii src="java" dest="${tomcat.classes}" includes="**/LocalStrings.properties,**/Messages*.properties" encoding="UTF-8"/>
<native2ascii src="java" dest="${tomcat.i18n}" includes="**/LocalStrings_*.properties" encoding="UTF-8"/>
+
+ <!-- Ensure consistent line-endings for reproducible builds -->
+ <fixcrlf srcdir="${tomcat.classes}" eol="lf"
+ encoding="UTF-8" fixlast="false" >
+ <patternset refid="text.files" />
+ </fixcrlf>
+ <fixcrlf srcdir="${tomcat.i18n}" eol="lf"
+ encoding="UTF-8" fixlast="false" >
+ <patternset refid="text.files" />
+ </fixcrlf>
</target>
<target name="build-manifests" unless="manifests.uptodate"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/07: Reproducibility for tomcat-jdbc when built as part of Tomcat
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1c10bf30f622ce77052de1673062b50c81b1f6bf
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jan 24 18:42:39 2022 +0000
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 @@
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Build Defaults -->
- <property name="tomcat.pool" value="${basedir}/./output"/>
- <property name="tomcat.build" value="${tomcat.pool}/build"/>
- <property name="tomcat.classes" value="${tomcat.pool}/classes"/>
- <property name="tomcat.api" value="${tomcat.pool}/api"/>
+ <property name="tomcat.pool" value="${basedir}/./output"/>
+ <property name="tomcat.build" value="${tomcat.pool}/build"/>
+ <property name="tomcat.classes" value="${tomcat.pool}/classes"/>
+ <property name="tomcat.api" value="${tomcat.pool}/api"/>
<property name="tomcat.testclasses" value="${tomcat.pool}/testclasses"/>
+ <property name="tomcat.mbeans" value="${tomcat.pool}/mbeans"/>
<!-- JAR Artifacts -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
@@ -79,7 +80,7 @@
<pathelement location="${h2.jar}"/>
</path>
- <fileset id="license.notice" dir="${basedir}">
+ <fileset id="license.notice" dir="${tomcat.pool}">
<include name="NOTICE"/>
<include name="LICENSE"/>
</fileset>
@@ -111,6 +112,15 @@
</fileset>
<filterset refid="version.filters"/>
</copy>
+ <copy todir="${tomcat.mbeans}">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="org/apache/tomcat/jdbc/**/*.xml" />
+ </fileset>
+ </copy>
+ <fixcrlf srcdir="${tomcat.pool}" includes="LICENSE,NOTICE" eol="lf"
+ encoding="UTF-8" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.mbeans}" eol="lf"
+ encoding="UTF-8" fixlast="false" />
</target>
<target name="javadoc" depends="prepare">
@@ -168,9 +178,7 @@
<fileset dir="${tomcat.classes}">
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
- <fileset dir="${basedir}/src/main/java">
- <include name="org/apache/tomcat/jdbc/**/*.xml" />
- </fileset>
+ <fileset dir="${tomcat.mbeans}"/>
<fileset refid="license.notice"/>
</jar>
</target>
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 @@
</scode>
</changelog>
</subsection>
+ <subsection name="jdbc-pool">
+ <changelog>
+ <scode>
+ Use LF line endings for text files in JARs to support reproducible
+ builds across different operating systems. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.75 (schultz)" rtext="2022-01-17">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/07: Add note about changes for text files in JARs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit dc9317cfdefbb66a07bec84614a1c7686b53a593
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 26 15:27:14 2022 +0000
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 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <scode>
+ Use LF line endings for text files in JARs to support reproducible
+ builds across different operating systems. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.75 (schultz)" rtext="2022-01-17">
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/07: Silence a dependabot nag (it is a test dependency)
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit eb2b81b3b5e4e8eb101eff9dbe9ea3924f1005c9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 26 15:43:53 2022 +0000
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 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.0.206</version>
+ <version>2.0.210</version>
<scope>test</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 07/07: Add entry for move to building with Java 11
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d53cdd2bc4349b9d12832a74c37ab1cffe8fa8a2
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jan 26 16:32:22 2022 +0000
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 @@
<subsection name="Other">
<changelog>
<scode>
+ Switch to building with Java 11 and using <code>--release</code> 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)
+ </scode>
+ <scode>
Use LF line endings for text files in JARs to support reproducible
builds across different operating systems. (markt)
</scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org