Merge branch 'release/2.0.2'

.travis.yml

@@ -20,10 +20,11 @@ env:
     - MARIA=10.1 PACKET=20M
     - MARIA=10.1 PACKET=40M
     - MARIA=10.2 PACKET=8M
+    - MARIA=10.2 PACKET=8M PROFILE=true
     - MARIA=10.2 PACKET=20M
     - MARIA=10.2 PACKET=40M
     - TYPE=PREPARE MARIA=10.1 PACKET=40M
-    - TYPE=MAXSCALE MAXSCALE_VERSION=2.0.2 MARIA=10.1 PACKET=40M
+    - TYPE=MAXSCALE MAXSCALE_VERSION=2.1.3 MARIA=10.1 PACKET=40M
     - TYPE=REWRITE MARIA=10.1 PACKET=40M
     - TYPE=MULTI MARIA=10.1 PACKET=40M
     - TYPE=BULK_SERVER MARIA=10.1 PACKET=40M

.travis/before_test.sh

@@ -13,8 +13,8 @@ remove_mysql(){
 if [ "$TYPE" == "MAXSCALE" ]
 then
     #install maxscale
-    wget "https://downloads.mariadb.com/MaxScale/${MAXSCALE_VERSION}/ubuntu/dists/trusty/main/binary-amd64/maxscale-2.0.2-1.ubuntu.trusty.x86_64.deb"
-    sudo dpkg -i maxscale-2.0.2-1.ubuntu.trusty.x86_64.deb
+    wget "https://downloads.mariadb.com/MaxScale/${MAXSCALE_VERSION}/ubuntu/dists/trusty/main/binary-amd64/maxscale-${MAXSCALE_VERSION}-1.ubuntu.trusty.x86_64.deb"
+    sudo dpkg -i maxscale-${MAXSCALE_VERSION}-1.ubuntu.trusty.x86_64.deb
     sudo apt-get install -f
     sudo sed -i 's/user=myuser/user=root/g' /etc/maxscale.cnf
     sudo sed -i 's/passwd=mypwd/passwd=/g' /etc/maxscale.cnf
@@ -59,12 +59,12 @@ END
         if [ "$MARIA" != "5.5" ]
         then
             sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
-            sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/${MARIA}/ubuntu trusty main"
+            sudo add-apt-repository "deb [arch=amd64,i386,ppc64el] http://mirrors.digitalocean.com/mariadb/repo/${MARIA}/ubuntu trusty main"
 
             #Force using MariaDB repo in place of System repo
             sudo tee /etc/apt/preferences.d/MariaDB.pref << END
 Package: *
-Pin: origin nyc2.mirrors.digitalocean.com
+Pin: origin mirrors.digitalocean.com
 Pin-Priority: 1000
 END
 
@@ -131,7 +131,5 @@ then
     sudo sed -i 's|Listener]|Listener]\nssl=enabled\nssl_cert=/etc/mysql/server.crt\nssl_key=/etc/mysql/server.key\nssl_ca_cert=/etc/mysql/ca.crt|g' /etc/maxscale.cnf
 
     sudo service maxscale start
-    tail -n500 /var/log/maxscale/maxscale1.log
-    tail -n500 /etc/maxscale.cnf
 
 fi

.travis/script.sh

@@ -28,11 +28,29 @@ case "$TYPE" in
  "COMPRESSION" )
    urlString=-DdbUrl='jdbc:mariadb://localhost:3306/testj?user=root&useCompression=true'
    ;;
+  *)
+   urlString=-DdbUrl='jdbc:mariadb://localhost:3306/testj?user=root'
+   ;;
 esac;
 
+
+if [ -n "$PROFILE" ]
+then
+    export urlString="$urlString&profileSql=true"
+    pwd
+    rm src/test/resources/logback-test.xml
+    mv src/test/resources/logback-test-travis.xml src/test/resources/logback-test.xml
+fi
+
 if [ -n "$AURORA" ]
 then
-    testSingleHost=false
+    if [ -n "$AURORA_STRING_URL" ]
+    then
+        urlString=-DdbUrl=$AURORA_STRING_URL
+        testSingleHost=true
+    else
+        testSingleHost=false
+    fi
 else
     testSingleHost=true
 fi

README.md

@@ -31,7 +31,7 @@ or maven :
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 </dependency>
 ```
 

build.xml

@@ -1,5 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ /*
+  ~ MariaDB Client for Java
+  ~
+  ~ Copyright (c) 2012-2014 Monty Program Ab.
+  ~ Copyright (c) 2015-2017 MariaDB Ab.
+  ~
+  ~ This library is free software; you can redistribute it and/or modify it under
+  ~ the terms of the GNU Lesser General Public License as published by the Free
+  ~ Software Foundation; either version 2.1 of the License, or (at your option)
+  ~ any later version.
+  ~
+  ~ This library is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License along
+  ~ with this library; if not, write to Monty Program Ab [email protected].
+  ~
+  ~ This particular MariaDB Client for Java file is work
+  ~ derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
+  ~ the following copyright and notice provisions:
+  ~
+  ~ Copyright (c) 2009-2011, Marcus Eriksson
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification,
+  ~ are permitted provided that the following conditions are met:
+  ~ Redistributions of source code must retain the above copyright notice, this list
+  ~ of conditions and the following disclaimer.
+  ~
+  ~ Redistributions in binary form must reproduce the above copyright notice, this
+  ~ list of conditions and the following disclaimer in the documentation and/or
+  ~ other materials provided with the distribution.
+  ~
+  ~ Neither the name of the driver nor the names of its contributors may not be
+  ~ used to endorse or promote products derived from this software without specific
+  ~ prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
+  ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  ~ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  ~ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+  ~ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  ~ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ~ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+  ~ OF SUCH DAMAGE.
+  ~ */
+  -->
+
 <!-- ====================================================================== -->
 <!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
 <!-- ====================================================================== -->

documentation/changelog.creole

@@ -1,4 +1,6 @@
 = Changelog
+* [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#202|2.0.2]] Released on 05 Jun. 2017
+* [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#161|1.6.1]] Released on 05 Jun. 2017
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#201|2.0.1]] Released on 10 May  2017
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#160|1.6.0]] Released on 10 May  2017
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#200|2.0.0]] Released on 11 Apr. 2017
@@ -21,6 +23,27 @@
 * [[https://github.com/MariaDB/mariadb-connector-j/documentation/changelog.creole#140|1.4.0]] Released on 31 march 2016
 
 ---
+== 1.6.1
+report of 2.0.2 corrections for jre 1.7 compatible version.
+
+== 2.0.2
+Bug
+*[CONJ-490] - DataSource connectTimeout is in second, but was set on socket timeout that is in milliseconds
+*[CONJ-481] - Buffer overrun reading ResultSet when using option "useServerPrepStmts"
+*[CONJ-470] - Error when executing SQL contains "values" and rewriteBatchedStatements=true
+*[CONJ-471] - PK_NAME returned by DatabaseMetadata.getPrimaryKeys() should not be null
+*[CONJ-477] - Aurora not compatible with option usePipelineAuth. Now automatically disabled when aurora is detected
+*[CONJ-479] - ArrayIndexOutOfBoundsException on connect to MySQL 5.1.73
+*[CONJ-480] - Access denied error on connect to MySQL 5.1.73
+*[CONJ-483] - Wrong content of DEFERRABILITY column in MariaDbDatabaseMetaData
+*[CONJ-487] - No timeout exception on Client PrepareStatement
+*[CONJ-489] - javax.transaction.xa.XAException message error truncated ( near '0x )
+
+Task
+*[CONJ-478] - Change CI tests to use maxscale 2.1 version
+*[CONJ-482] - Connection.setNetworkTimeout don't throw exception if no executor
+*[CONJ-488] - Use java.net.URL to read keyStore and trustStore again
+
 == 2.0.1
 * CONJ-467 - changing database metadata to 4.2
 * CONJ-460 - Query that contain multiqueries with fetch and EOF deprecation failed

maven-build.properties

@@ -1,3 +1,55 @@
+#
+# /*
+# MariaDB Client for Java
+#
+# Copyright (c) 2012-2014 Monty Program Ab.
+# Copyright (c) 2015-2017 MariaDB Ab.
+#
+# This library is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License along
+# with this library; if not, write to Monty Program Ab [email protected].
+#
+# This particular MariaDB Client for Java file is work
+# derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
+# the following copyright and notice provisions:
+#
+# Copyright (c) 2009-2011, Marcus Eriksson
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+# Redistributions of source code must retain the above copyright notice, this list
+# of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice, this
+# list of conditions and the following disclaimer in the documentation and/or
+# other materials provided with the distribution.
+#
+# Neither the name of the driver nor the names of its contributors may not be
+# used to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+# INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+# OF SUCH DAMAGE.
+# */
+#
+
 #Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
 #Mon Jul 13 22:05:03 CEST 2015
 maven.settings.offline=false

maven-build.xml

@@ -1,5 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+  ~ /*
+  ~ MariaDB Client for Java
+  ~
+  ~ Copyright (c) 2012-2014 Monty Program Ab.
+  ~ Copyright (c) 2015-2017 MariaDB Ab.
+  ~
+  ~ This library is free software; you can redistribute it and/or modify it under
+  ~ the terms of the GNU Lesser General Public License as published by the Free
+  ~ Software Foundation; either version 2.1 of the License, or (at your option)
+  ~ any later version.
+  ~
+  ~ This library is distributed in the hope that it will be useful, but
+  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  ~ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+  ~ for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License along
+  ~ with this library; if not, write to Monty Program Ab [email protected].
+  ~
+  ~ This particular MariaDB Client for Java file is work
+  ~ derived from a Drizzle-JDBC. Drizzle-JDBC file which is covered by subject to
+  ~ the following copyright and notice provisions:
+  ~
+  ~ Copyright (c) 2009-2011, Marcus Eriksson
+  ~
+  ~ Redistribution and use in source and binary forms, with or without modification,
+  ~ are permitted provided that the following conditions are met:
+  ~ Redistributions of source code must retain the above copyright notice, this list
+  ~ of conditions and the following disclaimer.
+  ~
+  ~ Redistributions in binary form must reproduce the above copyright notice, this
+  ~ list of conditions and the following disclaimer in the documentation and/or
+  ~ other materials provided with the distribution.
+  ~
+  ~ Neither the name of the driver nor the names of its contributors may not be
+  ~ used to endorse or promote products derived from this software without specific
+  ~ prior written permission.
+  ~
+  ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS  AND CONTRIBUTORS "AS IS"
+  ~ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  ~ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+  ~ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+  ~ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  ~ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+  ~ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ~ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+  ~ OF SUCH DAMAGE.
+  ~ */
+  -->
+
 <!-- ====================================================================== -->
 <!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above.        -->
 <!-- ====================================================================== -->