Mercurial > hg > monetdb-java

diff build.xml @ 768:a80c21fe7bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed deprecated nl.cwi.monetdb.*.* classes and package. Those classes were marked deprecated on 12 Nov 2020 from release 3.0 (released on 17 Feb 2021) onwards. It includes: nl.cwi.monetdb.client.JdbcClient.class nl.cwi.monetdb.jdbc.MonetDriver.class nl.cwi.monetdb.jdbc.types.INET.class nl.cwi.monetdb.jdbc.types.URL.class nl.cwi.monetdb.mcl.net.MapiSocket.class These classes are now removed permanently. Use the org.monetdb.* equivalents instead.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 06 Jul 2023 15:35:04 +0200 (22 months ago)
parents 342fc48c95cd
children f261fe3c7fe4
line wrap: on
line diff
--- a/build.xml
+++ b/build.xml
@@ -28,11 +28,6 @@ Copyright 1997 - July 2008 CWI, August 2
   <property name="util-package"          value="org/monetdb/util" />
   <property name="mero-control-package"  value="org/monetdb/merovingian" />
 
-  <!-- old nl/cwi/monetdb packages for some deprecated classes as of nov2020 -->
-  <property name="nl-cwi-jdbc-package"   value="nl/cwi/monetdb/jdbc" />
-  <property name="nl-cwi-mcl-package"    value="nl/cwi/monetdb/mcl" />
-  <property name="nl-cwi-client-package" value="nl/cwi/monetdb/client" />
-
   <property file="build.local.properties" />
   <property file="build.properties" />
 
@@ -93,10 +88,7 @@ Copyright 1997 - July 2008 CWI, August 2
       <fileset dir="${builddir}">
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
         <include name="${util-package}/FileTransferHandler.class" />
       </fileset>
     </jar>
@@ -106,7 +98,6 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jardir}/monetdb-clients.jar">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
       </fileset>
     </jar>
@@ -120,14 +111,10 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jdbcclient-jar}">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -181,9 +168,6 @@ Copyright 1997 - July 2008 CWI, August 2
       >
       <src path="${srcdir}" />
       <include name="${jdbc-package}/**/*.java" />
-      <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-      <include name="${nl-cwi-jdbc-package}/types/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <include name="${util-package}/FileTransferHandler.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
@@ -202,7 +186,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${mcl-package}/**/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -220,7 +203,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${client-package}/**/*.java" />
-      <include name="${nl-cwi-client-package}/JdbcClient.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -313,21 +295,14 @@ Copyright 1997 - July 2008 CWI, August 2
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar">
       <srcfiles dir="${srcdir}">
         <include name="${client-package}/**/*.java" />
-        <include name="${nl-cwi-client-package}/JdbcClient.java" />
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">