From 9aff261da7792a35494330e28a5158a33a511301 Mon Sep 17 00:00:00 2001
From: Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
Date: Thu, 9 Jan 2025 17:44:02 +0100
Subject: [PATCH] repair dependencies

---
 build.xml       | 21 ++++++++++-----------
 build_jre17.xml | 21 ++++++++++-----------
 build_jre21.xml | 21 ++++++++++-----------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/build.xml b/build.xml
index 6c181b3..f759f33 100644
--- a/build.xml
+++ b/build.xml
@@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI.
 
 <project name="MonetDB_Java_Drivers" default="default" basedir=".">
 
-
   <!-- set global properties for this build -->
   <property name="srcdir"                value="src/main/java" />
   <property name="libdir"                value="lib" />
@@ -69,12 +68,13 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <target name="default">
-    <antcall target="jar_jdbc" />
+    <antcall target="distjdbc" />
     <antcall target="jar_jmonetdb" />
   </target>
 
   <target name="distjdbc">
     <antcall target="jar_jdbc" />
+    <antcall target="jar_jdbcclient" />
   </target>
 
   <target name="distmerocontrol">
@@ -87,12 +87,12 @@ Copyright 1997 - July 2008 CWI.
     <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
     <jar jarfile="${jdbc-jar}">
       <fileset dir="${builddir}">
-        <include name="META-INF/services/java.sql.Driver" />
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
         <include name="${mcl-package}/**/*.class" />
+        <!-- JdbcClient is now included in the JDBC jar -->
+        <include name="${client-package}/**/*.class" />
+        <include name="${util-package}/**/*.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -102,8 +102,7 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility -->
-  <target name="jar_jdbcclient"
-    depends="jar_jdbc">
+  <target name="jar_jdbcclient" depends="jar_jdbc">
     <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
     <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
   </target>
@@ -275,11 +274,11 @@ Copyright 1997 - July 2008 CWI.
 
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
-        <include name="${jdbc-package}/**/*.class" />
-        <include name="${mcl-package}/**/*.class" />
+        <include name="${jdbc-package}/**/*.java" />
+        <include name="${mcl-package}/**/*.java" />
+        <include name="${client-package}/**/*.java" />
+        <include name="${util-package}/**/*.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
diff --git a/build_jre17.xml b/build_jre17.xml
index 2325755..b429077 100644
--- a/build_jre17.xml
+++ b/build_jre17.xml
@@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI.
 
 <project name="MonetDB_Java_Drivers" default="default" basedir=".">
 
-
   <!-- set global properties for this build -->
   <property name="srcdir"                value="src/main/java" />
   <property name="libdir"                value="lib" />
@@ -72,12 +71,13 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <target name="default">
-    <antcall target="jar_jdbc" />
+    <antcall target="distjdbc" />
     <antcall target="jar_jmonetdb" />
   </target>
 
   <target name="distjdbc">
     <antcall target="jar_jdbc" />
+    <antcall target="jar_jdbcclient" />
   </target>
 
   <target name="distmerocontrol">
@@ -90,12 +90,12 @@ Copyright 1997 - July 2008 CWI.
     <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
     <jar jarfile="${jdbc-jar}">
       <fileset dir="${builddir}">
-        <include name="META-INF/services/java.sql.Driver" />
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
         <include name="${mcl-package}/**/*.class" />
+        <!-- JdbcClient is now included in the JDBC jar -->
+        <include name="${client-package}/**/*.class" />
+        <include name="${util-package}/**/*.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -105,8 +105,7 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility -->
-  <target name="jar_jdbcclient"
-    depends="jar_jdbc">
+  <target name="jar_jdbcclient" depends="jar_jdbc">
     <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
     <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
   </target>
@@ -278,11 +277,11 @@ Copyright 1997 - July 2008 CWI.
 
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
-        <include name="${jdbc-package}/**/*.class" />
-        <include name="${mcl-package}/**/*.class" />
+        <include name="${jdbc-package}/**/*.java" />
+        <include name="${mcl-package}/**/*.java" />
+        <include name="${client-package}/**/*.java" />
+        <include name="${util-package}/**/*.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
diff --git a/build_jre21.xml b/build_jre21.xml
index 57c9e42..60e446a 100644
--- a/build_jre21.xml
+++ b/build_jre21.xml
@@ -19,7 +19,6 @@ Copyright 1997 - July 2008 CWI.
 
 <project name="MonetDB_Java_Drivers" default="default" basedir=".">
 
-
   <!-- set global properties for this build -->
   <property name="srcdir"                value="src/main/java" />
   <property name="libdir"                value="lib" />
@@ -75,12 +74,13 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <target name="default">
-    <antcall target="jar_jdbc" />
+    <antcall target="distjdbc" />
     <antcall target="jar_jmonetdb" />
   </target>
 
   <target name="distjdbc">
     <antcall target="jar_jdbc" />
+    <antcall target="jar_jdbcclient" />
   </target>
 
   <target name="distmerocontrol">
@@ -93,12 +93,12 @@ Copyright 1997 - July 2008 CWI.
     <echo file="${builddir}/META-INF/services/java.sql.Driver" append="false">org.monetdb.jdbc.MonetDriver</echo>
     <jar jarfile="${jdbc-jar}">
       <fileset dir="${builddir}">
-        <include name="META-INF/services/java.sql.Driver" />
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
         <include name="${mcl-package}/**/*.class" />
+        <!-- JdbcClient is now included in the JDBC jar -->
+        <include name="${client-package}/**/*.class" />
+        <include name="${util-package}/**/*.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -108,8 +108,7 @@ Copyright 1997 - July 2008 CWI.
   </target>
 
   <!-- JdbcClient is now included in the JDBC jar but we also provide it by its old name for backward compatibility -->
-  <target name="jar_jdbcclient"
-    depends="jar_jdbc">
+  <target name="jar_jdbcclient" depends="jar_jdbc">
     <echo message="Copying ${jdbc-jar} to ${jdbcclient-jar}" />
     <copy file="${jdbc-jar}" tofile="${jdbcclient-jar}" />
   </target>
@@ -281,11 +280,11 @@ Copyright 1997 - July 2008 CWI.
 
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
-        <include name="${client-package}/**/*.class" />
-        <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
-        <include name="${jdbc-package}/**/*.class" />
-        <include name="${mcl-package}/**/*.class" />
+        <include name="${jdbc-package}/**/*.java" />
+        <include name="${mcl-package}/**/*.java" />
+        <include name="${client-package}/**/*.java" />
+        <include name="${util-package}/**/*.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">