|
1 | 1 | <?xml version='1.0'?>
|
2 | 2 | <!--
|
3 |
| - Copyright (c) 2002, 2019, Oracle and/or its affiliates. All rights reserved. |
| 3 | + Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved. |
4 | 4 |
|
5 | 5 | The MySQL Connector/J is licensed under the terms of the GPLv2
|
6 | 6 | <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
|
@@ -222,10 +222,6 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes
|
222 | 222 | <include name="**/*.jar" />
|
223 | 223 | </fileset>
|
224 | 224 |
|
225 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
226 |
| - <include name="**/*.jar" /> |
227 |
| - </fileset> |
228 |
| - |
229 | 225 | <pathelement location="${buildDir}/${fullProdName}" />
|
230 | 226 | </path>
|
231 | 227 |
|
@@ -731,7 +727,7 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
731 | 727 | <patternset refid="non.test.sources" />
|
732 | 728 | </fileset>
|
733 | 729 |
|
734 |
| - <fileset dir="." includes="src/com/**, src/doc/**, src/lib/*, src/org/**, src/testsuite/**, src/demo/**, build.xml, CHANGES, COPYING"> |
| 730 | + <fileset dir="." includes="src/com/**, src/doc/**, src/org/**, src/testsuite/**, src/demo/**, build.xml, CHANGES, COPYING"> |
735 | 731 | <patternset refid="non.test.sources" />
|
736 | 732 | </fileset>
|
737 | 733 | </copy>
|
@@ -1203,9 +1199,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1203 | 1199 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1204 | 1200 | <include name="**/*.jar" />
|
1205 | 1201 | </fileset>
|
1206 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1207 |
| - <include name="**/*.jar" /> |
1208 |
| - </fileset> |
1209 | 1202 | <pathelement location="${buildDir}/${fullProdName}-instr" />
|
1210 | 1203 | <pathelement location="${buildDir}/${fullProdName}" />
|
1211 | 1204 | <pathelement path="${java.class.path}" />
|
@@ -1255,9 +1248,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1255 | 1248 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1256 | 1249 | <include name="**/*.jar" />
|
1257 | 1250 | </fileset>
|
1258 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1259 |
| - <include name="**/*.jar" /> |
1260 |
| - </fileset> |
1261 | 1251 | <pathelement location="${buildDir}/${fullProdName}-instr" />
|
1262 | 1252 | <pathelement location="${buildDir}/${fullProdName}" />
|
1263 | 1253 | <pathelement path="${java.class.path}" />
|
@@ -1300,9 +1290,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1300 | 1290 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1301 | 1291 | <include name="**/*.jar" />
|
1302 | 1292 | </fileset>
|
1303 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1304 |
| - <include name="**/*.jar" /> |
1305 |
| - </fileset> |
1306 | 1293 | <pathelement location="${buildDir}/${fullProdName}-instr" />
|
1307 | 1294 | <pathelement location="${buildDir}/${fullProdName}" />
|
1308 | 1295 | <pathelement path="${java.class.path}" />
|
@@ -1397,9 +1384,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1397 | 1384 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1398 | 1385 | <include name="**/*.jar" />
|
1399 | 1386 | </fileset>
|
1400 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1401 |
| - <include name="**/*.jar" /> |
1402 |
| - </fileset> |
1403 | 1387 | <pathelement location="${buildDir}/${fullProdName}" />
|
1404 | 1388 | <pathelement path="${java.class.path}" />
|
1405 | 1389 | <pathelement location="${jdbc.compliance.location}" />
|
@@ -1626,9 +1610,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1626 | 1610 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1627 | 1611 | <include name="**/*.jar" />
|
1628 | 1612 | </fileset>
|
1629 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1630 |
| - <include name="**/*.jar" /> |
1631 |
| - </fileset> |
1632 | 1613 | <pathelement location="${buildDir}/${fullProdName}" />
|
1633 | 1614 | <pathelement path="${java.class.path}" />
|
1634 | 1615 | </classpath>
|
@@ -1679,9 +1660,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1679 | 1660 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1680 | 1661 | <include name="**/*.jar" />
|
1681 | 1662 | </fileset>
|
1682 |
| - <fileset dir="${buildDir}/${fullProdName}/lib"> |
1683 |
| - <include name="**/*.jar" /> |
1684 |
| - </fileset> |
1685 | 1663 | <pathelement location="${buildDir}/${fullProdName}" />
|
1686 | 1664 | <pathelement path="${java.class.path}" />
|
1687 | 1665 | </classpath>
|
@@ -1766,9 +1744,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
|
1766 | 1744 | <fileset dir="${com.mysql.jdbc.extra.libs}">
|
1767 | 1745 | <include name="**/*.jar" />
|
1768 | 1746 | </fileset>
|
1769 |
| - <fileset dir="src/lib"> |
1770 |
| - <include name="**/*.jar" /> |
1771 |
| - </fileset> |
1772 | 1747 | <dirset dir="${buildDir}/${fullProdName}" />
|
1773 | 1748 | </classpath>
|
1774 | 1749 | </java>
|
|
0 commit comments