Skip to content

Commit c64f291

Browse files
committed
WL#14007, Remove third-party libraries from sources and bundles
1 parent bd87966 commit c64f291

8 files changed

+4
-30
lines changed

.classpath

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry excluding="**/JDBC4*.java|**/jdbc4*/**" kind="src" path="src"/>
4-
<classpathentry kind="lib" path="src/lib/jboss-common-jdbc-wrapper.jar"/>
5-
<classpathentry kind="lib" path="src/lib/c3p0-0.9.1-pre6.jar"/>
6-
<classpathentry kind="lib" path="src/lib/slf4j-api-1.6.1.jar"/>
74
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
85
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/MySQL ConnectorJ Extra Libraries"/>
96
<classpathentry kind="output" path="bin"/>

CHANGES

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
Version 5.1.49
55

6+
- WL#14007, Remove third-party libraries from sources and bundles.
7+
68
- Fix for Bug#98237 (30911870), PREPAREDSTATEMENT.SETOBJECT(I, "FALSE", TYPES.BOOLEAN) ALWAYS SETS TRUE OR 1.
79

810
- Fix for Bug#30866178, Not recommended default for 'allowLoadLocalInfile'. Back-port from Bug#94051 (29261254).

build.xml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version='1.0'?>
22
<!--
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.
44
55
The MySQL Connector/J is licensed under the terms of the GPLv2
66
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
@@ -222,10 +222,6 @@ com.mysql.jdbc.noCleanBetweenCompiles=yes
222222
<include name="**/*.jar" />
223223
</fileset>
224224

225-
<fileset dir="${buildDir}/${fullProdName}/lib">
226-
<include name="**/*.jar" />
227-
</fileset>
228-
229225
<pathelement location="${buildDir}/${fullProdName}" />
230226
</path>
231227

@@ -731,7 +727,7 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
731727
<patternset refid="non.test.sources" />
732728
</fileset>
733729

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">
735731
<patternset refid="non.test.sources" />
736732
</fileset>
737733
</copy>
@@ -1203,9 +1199,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
12031199
<fileset dir="${com.mysql.jdbc.extra.libs}">
12041200
<include name="**/*.jar" />
12051201
</fileset>
1206-
<fileset dir="${buildDir}/${fullProdName}/lib">
1207-
<include name="**/*.jar" />
1208-
</fileset>
12091202
<pathelement location="${buildDir}/${fullProdName}-instr" />
12101203
<pathelement location="${buildDir}/${fullProdName}" />
12111204
<pathelement path="${java.class.path}" />
@@ -1255,9 +1248,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
12551248
<fileset dir="${com.mysql.jdbc.extra.libs}">
12561249
<include name="**/*.jar" />
12571250
</fileset>
1258-
<fileset dir="${buildDir}/${fullProdName}/lib">
1259-
<include name="**/*.jar" />
1260-
</fileset>
12611251
<pathelement location="${buildDir}/${fullProdName}-instr" />
12621252
<pathelement location="${buildDir}/${fullProdName}" />
12631253
<pathelement path="${java.class.path}" />
@@ -1300,9 +1290,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
13001290
<fileset dir="${com.mysql.jdbc.extra.libs}">
13011291
<include name="**/*.jar" />
13021292
</fileset>
1303-
<fileset dir="${buildDir}/${fullProdName}/lib">
1304-
<include name="**/*.jar" />
1305-
</fileset>
13061293
<pathelement location="${buildDir}/${fullProdName}-instr" />
13071294
<pathelement location="${buildDir}/${fullProdName}" />
13081295
<pathelement path="${java.class.path}" />
@@ -1397,9 +1384,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
13971384
<fileset dir="${com.mysql.jdbc.extra.libs}">
13981385
<include name="**/*.jar" />
13991386
</fileset>
1400-
<fileset dir="${buildDir}/${fullProdName}/lib">
1401-
<include name="**/*.jar" />
1402-
</fileset>
14031387
<pathelement location="${buildDir}/${fullProdName}" />
14041388
<pathelement path="${java.class.path}" />
14051389
<pathelement location="${jdbc.compliance.location}" />
@@ -1626,9 +1610,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
16261610
<fileset dir="${com.mysql.jdbc.extra.libs}">
16271611
<include name="**/*.jar" />
16281612
</fileset>
1629-
<fileset dir="${buildDir}/${fullProdName}/lib">
1630-
<include name="**/*.jar" />
1631-
</fileset>
16321613
<pathelement location="${buildDir}/${fullProdName}" />
16331614
<pathelement path="${java.class.path}" />
16341615
</classpath>
@@ -1679,9 +1660,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
16791660
<fileset dir="${com.mysql.jdbc.extra.libs}">
16801661
<include name="**/*.jar" />
16811662
</fileset>
1682-
<fileset dir="${buildDir}/${fullProdName}/lib">
1683-
<include name="**/*.jar" />
1684-
</fileset>
16851663
<pathelement location="${buildDir}/${fullProdName}" />
16861664
<pathelement path="${java.class.path}" />
16871665
</classpath>
@@ -1766,9 +1744,6 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
17661744
<fileset dir="${com.mysql.jdbc.extra.libs}">
17671745
<include name="**/*.jar" />
17681746
</fileset>
1769-
<fileset dir="src/lib">
1770-
<include name="**/*.jar" />
1771-
</fileset>
17721747
<dirset dir="${buildDir}/${fullProdName}" />
17731748
</classpath>
17741749
</java>

src/lib/c3p0-0.9.1-pre6.jar

-519 KB
Binary file not shown.

src/lib/c3p0-0.9.1-pre6.src.zip

-589 KB
Binary file not shown.
-34.5 KB
Binary file not shown.

src/lib/jboss-common-jdbc-wrapper.jar

-49 KB
Binary file not shown.

src/lib/slf4j-api-1.6.1.jar

-24.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)