Skip to content

Commit

Permalink
Fix for Bug#27231383, PROVIDE MAVEN-FRIENDLY COMMERCIAL PACKAGES WITH…
Browse files Browse the repository at this point in the history
…OUT "-BIN".
  • Loading branch information
fjssilva committed Feb 1, 2018
1 parent e42ce76 commit d2f8baa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

Version 5.1.46

- Fix for Bug#27231383, PROVIDE MAVEN-FRIENDLY COMMERCIAL PACKAGES WITHOUT "-BIN".

- Fix for Bug#26819691, SETTING PACKETDEBUGBUFFERSIZE=0 RESULTS IN CONNECTION FAILURE.

- WL#11200, Add caching_sha2_password support.
Expand Down
9 changes: 8 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0'?>
<!--
Copyright (c) 2002, 2017, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2002, 2018, Oracle and/or its affiliates. All rights reserved.
The MySQL Connector/J is licensed under the terms of the GPLv2
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most MySQL Connectors.
Expand Down Expand Up @@ -618,6 +618,7 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this

<!-- Build a distribution 'image' that doesn't include docs. -->
<target name="dist" description="Builds driver and binary .jar file, basically a distribution 'image' without docs." depends="init, compile">
<delete file="${buildDir}/${fullProdName}.jar" />
<delete file="${buildDir}/${fullProdName}-bin.jar" />

<mkdir dir="${buildDir}/META-INF" />
Expand Down Expand Up @@ -680,6 +681,12 @@ Java 8 (for JDBC 4+ implementation) is also required. Set the full path to this
value="${crypto-imports},${jdbc4-imports},${jee-imports},${jmx-imports},${integration-imports},${logging-imports},${fabric-imports}" />
</manifest>

<jar jarfile="${buildDir}/${fullProdName}/${fullProdName}.jar"
basedir="${compiler.output}"
includes="**/*.class,**/*.properties*,META-INF/**"
excludes="testsuite/**,demo/**"
index="true"
manifest="${buildDir}/${fullProdName}/META-INF/MANIFEST.MF" />
<jar jarfile="${buildDir}/${fullProdName}/${fullProdName}-bin.jar"
basedir="${compiler.output}"
includes="**/*.class,**/*.properties*,META-INF/**"
Expand Down

0 comments on commit d2f8baa

Please sign in to comment.