Merge branch 'release/2.6.0'

.travis/build/Dockerfile

@@ -57,8 +57,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 RUN { \
-		echo "mariadb-server-10.4" mysql-server/root_password password 'unused'; \
-		echo "mariadb-server-10.4" mysql-server/root_password_again password 'unused'; \
+		echo "mariadb-server-10.5" mysql-server/root_password password 'unused'; \
+		echo "mariadb-server-10.5" mysql-server/root_password_again password 'unused'; \
 	} | debconf-set-selections
 
 RUN apt-get update -y

.travis/build/build.sh

@@ -4,22 +4,22 @@ echo "**************************************************************************
 echo "* searching for last complete build"
 echo "**************************************************************************"
 
-wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.4/
+wget -q -o /dev/null index.html http://hasky.askmonty.org/archive/10.5/
 grep -o ">build-[0-9]*" index.html | grep -o "[0-9]*" | tac | while read -r line ; do
 
-  curl -s --head http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+  curl -s --head http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/md5sums.txt | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
   if [ $? = "0" ]; then
     echo "**************************************************************************"
     echo "* Processing $line"
     echo "**************************************************************************"
-    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/
+    wget -q -o /dev/null -O $line.html  http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/
     grep -o ">[^\"]*\.deb" $line.html | grep -o "[^>]*\.deb" | while read -r file ; do
         if  [[ "$file" =~ ^mariadb-plugin.* ]] ;
         then
           echo "skipped file: $file"
         else
           echo "download file: $file"
-          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.4/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
+          wget -q -o /dev/null -O .travis/build/$file http://hasky.askmonty.org/archive/10.5/build-$line/kvm-deb-bionic-amd64/debs/binary/$file
         fi
     done
 

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Change Log
 
+## [2.6.0](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.6.0) (19 Mar. 2020)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.5.4...2.6.0)
+
+* CONJ-768 - Check Galera allowed state when connecting when option `galeraAllowedState` is set, and not only on validation
+* CONJ-759 - on failover, catalog changed might not be set when automatically recreating a connection. 
+* CONJ-761 - remove unnecessary dependencies for fedora tar creation
+* CONJ-763 - Custom SocketFactory now can change options
+* CONJ-764 - DatabaseMetaData.getExportedKeys should return "PRIMARY" for PK_NAME column
+* CONJ-765 - Allow MariaDbDatabaseMetaData#getExportedKeys to return the exported keys for all tables
+* CONJ-766 - Adding a socket timeout until complete authentication, to avoid hangs is server doesn't support pipelining
+* CONJ-767 - permit using Aurora RO endpoint
+* CONJ-771 - enablePacketDebug must not reset stack on failover
+* CONJ-772 - JDBC Conversion Function support parsing correction 
+
 ## [2.5.4](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.5.4) (27 Jan. 2020)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.5.3...2.5.4)
 

appveyor-download.bat

@@ -0,0 +1,17 @@
+@echo off
+set archive=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+set last=http://mirror.i3d.net/pub/mariadb//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
+
+curl -fsS -o server.msi %archive% 
+
+if %ERRORLEVEL% == 0 goto end
+
+
+curl -fsS -o server.msi %last%
+if %ERRORLEVEL% == 0  goto end
+
+echo Failure Reason Given is %errorlevel%
+exit /b %errorlevel%
+
+:end
+echo "File found".

appveyor.yml

@@ -1,27 +1,32 @@
 version: '{build}'
 environment:
   matrix:
-    - DB: '10.2.26'
+    - DB: '10.2.31'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
-    - DB: '10.3.17'
+    - DB: '10.3.22'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
-    - DB: '10.4.7'
+    - DB: '10.4.12'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
-    - DB: '10.1.41'
+    - DB: '10.5.1'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
 
-    - DB: '5.5.65'
+    - DB: '10.1.44'
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
+      JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+
+    - DB: '5.5.67'
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       CMAKE_PARAM: 'Visual Studio 15 2017 Win64'
       JAVA_HOME: C:\Program Files\Java\jdk1.8.0
@@ -35,19 +40,18 @@ install:
         [System.IO.Compression.ZipFile]::ExtractToDirectory("C:\maven-bin.zip", "C:\maven")
       }
   # Prepend Java entry, remove Ruby entry (C:\Ruby193\bin;) from PATH
-  - cmd: set FILE=http://ftp.hosteurope.de/mirror/archive.mariadb.org//mariadb-%DB%/winx64-packages/mariadb-%DB%-winx64.msi
-  - ps: Start-FileDownload $Env:FILE -FileName server.msi -Timeout 900000
+  - cmd: appveyor-download.bat
   - cmd: msiexec /i server.msi INSTALLDIR=c:\projects\server SERVICENAME=mariadb ALLOWREMOTEROOTACCESS=true /qn
   - cmd: "\"c:\\projects\\server\\bin\\mysql.exe\" -e \"create database testj\" --user=root"
   - cmd: SET PATH=C:\maven\apache-maven-3.5.4\bin;%JAVA_HOME%\bin;%PATH:C:\Ruby193\bin;=%;
   - cmd: SET MAVEN_OPTS=-Xms512m -Xms768m
   - cmd: SET JAVA_OPTS=-Xms512m -Xmx768m
   - cmd: SET M2_HOME=C:\maven\apache-maven-3.5.4
-  - cmd: SET M
   - cmd: cd c:\projects\mariadb-connector-j
   - cmd: mvn --version
   - cmd: java -version
 build_script:
-  - mvn clean package -Dmaven.test.skip=true
+  - mvn clean
+  - mvn test -Dmaven.test.skip=true
 test_script:
   - mvn test -DdbUrl="jdbc:mariadb://localhost/testj?user=root"

build.xml

@@ -5,7 +5,7 @@
   ~ MariaDB Client for Java
   ~
   ~ Copyright (c) 2012-2014 Monty Program Ab.
-  ~ Copyright (c) 2015-2017 MariaDB Ab.
+  ~ Copyright (c) 2015-2020 MariaDB Corporation 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

documentation/failover-and-high-availability-with-mariadb-connector-j.creole

@@ -241,6 +241,7 @@ Example of connection string
 }}}
 
 Another difference is the option "socketTimeout" that defaults to 10 seconds, meaning that - if not changed - queries exceeding 10 seconds will throw exceptions.  
+Note that the option "createDatabaseIfNotExist=true" causes reader instances to be blacklisted during the creation of a new connection, because this option sends a "CREATE DATABASE" statement to the reader which is not read-only and therefore is rejected.
 
 ==Aurora connection loop
 

maven-build.properties

@@ -4,7 +4,7 @@
 # MariaDB Client for Java
 #
 # Copyright (c) 2012-2014 Monty Program Ab.
-# Copyright (c) 2015-2017 MariaDB Ab.
+# Copyright (c) 2015-2020 MariaDB Corporation 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

maven-build.xml

@@ -5,7 +5,7 @@
   ~ MariaDB Client for Java
   ~
   ~ Copyright (c) 2012-2014 Monty Program Ab.
-  ~ Copyright (c) 2015-2017 MariaDB Ab.
+  ~ Copyright (c) 2015-2020 MariaDB Corporation 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