This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch hsqldb2 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit df745297953a29527df4ba959d9061528d02f4cf Author: Jim Jagielski <[email protected]> AuthorDate: Sun Nov 8 07:37:42 2026 -0500 hsqldb: stop the jar task writing four classes into hsqldb.jar twice --- main/hsqldb/makefile.mk | 2 +- main/hsqldb/patches/jar_duplicates.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/main/hsqldb/makefile.mk b/main/hsqldb/makefile.mk index 8843054009..baed998fb7 100644 --- a/main/hsqldb/makefile.mk +++ b/main/hsqldb/makefile.mk @@ -48,7 +48,7 @@ TARFILE_ROOTDIR=hsqldb-$(HSQLDB_VERSION)$/hsqldb CONVERTFILES=build$/build.xml \ src$/org$/hsqldb$/persist$/HsqlDatabaseProperties.java -PATCH_FILES=patches$/aoo_integration.patch +PATCH_FILES=patches$/aoo_integration.patch patches$/jar_duplicates.patch JAVAC_SRCTGT=-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 diff --git a/main/hsqldb/patches/jar_duplicates.patch b/main/hsqldb/patches/jar_duplicates.patch new file mode 100644 index 0000000000..127fba430e --- /dev/null +++ b/main/hsqldb/patches/jar_duplicates.patch @@ -0,0 +1,11 @@ +--- misc/hsqldb/hsqldb-2.5.0/hsqldb/build/build.xml ++++ misc/build/hsqldb-2.5.0/hsqldb/build/build.xml +@@ -595,7 +595,7 @@ + + <target name="hsqldb" depends="classes, -util, -prep-license-files" + description="Build the default hsqldb.jar"> +- <jar jarfile="lib/hsqldb.jar" compress="true"> ++ <jar jarfile="lib/hsqldb.jar" compress="true" duplicate="preserve"> + <metainf dir="doc" includes="*_lic.txt"/> + <service type="java.sql.Driver" provider="org.hsqldb.jdbc.JDBCDriver"/> + <manifest>
