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 <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 0381503..8b387af 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 35f26ea..b981d3e 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>
<subsection name="Other">
<changelog>
<scode>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
