This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 40247060bd Fix reproducibility for Tomcat releases
40247060bd is described below
commit 40247060bd74c40184fe1e3fee064256404d2d53
Author: Mark Thomas <[email protected]>
AuthorDate: Mon Nov 9 11:14:08 2026 +0000
Fix reproducibility for Tomcat releases
Forces i18n files to LF line-endings in tomcat-jdbc.jar
---
modules/jdbc-pool/build.xml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 5f2ed3c5a7..7f70b7889b 100644
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -54,6 +54,7 @@
<property name="tomcat.classes" value="${tomcat.pool}/classes"/>
<property name="tomcat.api" value="${tomcat.pool}/api"/>
<property name="tomcat.mbeans" value="${tomcat.pool}/mbeans"/>
+ <property name="tomcat.i18n" value="${tomcat.pool}/i18n"/>
<!-- JAR Artifacts -->
<property name="tomcat-jdbc.jar" value="${tomcat.pool}/tomcat-jdbc.jar"/>
@@ -101,10 +102,17 @@
<include name="org/apache/tomcat/jdbc/**/*.xml" />
</fileset>
</copy>
+ <copy todir="${tomcat.i18n}">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="org/apache/tomcat/jdbc/**/LocalStrings*.properties" />
+ </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" />
+ <fixcrlf srcdir="${tomcat.i18n}" eol="lf"
+ encoding="UTF-8" fixlast="false" />
</target>
<target name="javadoc" depends="prepare">
@@ -154,13 +162,6 @@
<include name="org/apache/tomcat/jdbc/**" />
</javac>
- <!-- Localized messages are stored with the sources -->
- <copy todir="${tomcat.classes}">
- <fileset dir="${basedir}/src/main/java">
- <include name="org/apache/tomcat/jdbc/**/*.properties" />
- </fileset>
- </copy>
-
<!-- connection pool JAR File -->
<jar jarfile="${tomcat-jdbc.jar}"
update="true"
@@ -170,6 +171,7 @@
<include name="org/apache/tomcat/jdbc/**" />
</fileset>
<fileset dir="${tomcat.mbeans}"/>
+ <fileset dir="${tomcat.i18n}"/>
<fileset refid="license.notice"/>
</jar>
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
