Merge branch 'release/2.7.1'

.travis.yml

@@ -39,6 +39,8 @@ matrix:
       jdk: openjdk11
     - env: SKYSQL=true PACKET=8M
       jdk: openjdk11
+    - env: SKYSQL_HA=true PACKET=8M
+      jdk: openjdk11
     - env: DB=mysql:5.7 PACKET=8M
       jdk: openjdk11
     - env: DB=mysql:8.0 PACKET=8M ADDITIONAL_CONF=--default-authentication-plugin=mysql_native_password --caching_sha2_password_private_key_path=/etc/sslcert/server.key --caching_sha2_password_public_key_path=/etc/sslcert/public.key
@@ -55,6 +57,8 @@ matrix:
       jdk: openjdk11
     - env: DB=mariadb:10.5 PACKET=8M
       jdk: oraclejdk11
+    - env: DB=mariadb:10.5 PACKET=8M BENCH=true
+      jdk: oraclejdk11
     - env: DB=mariadb:10.5 PACKET=8M GALERA=true
       jdk: openjdk11
     - env: DB=mariadb:10.5 PACKET=8M PROFILE=true
@@ -77,8 +81,6 @@ matrix:
       jdk: openjdk11
     - env: DB=mariadb:10.5 PACKET=40M COMPRESSION=true
       jdk: openjdk11
-    - env: DB=mariadb:10.5 PACKET=8M
-      jdk: openjdk12
     - env: DB=mariadb:10.5 PACKET=8M MAXSCALE_VERSION=2.5.3 MAXSCALE_TEST_DISABLE=true SSLPORT=4009
       jdk: openjdk11
 

.travis/script.sh

@@ -6,16 +6,25 @@ set -e
 ###################################################################################################################
 # test different type of configuration
 ###################################################################################################################
-if [ -n "$SKYSQL" ] ; then
-
-  if [ -z "$SKYSQL_HOST" ] ; then
-    echo "No SkySQL configuration found !"
-    exit 0
+if [ -n "$SKYSQL" ] || [ -n "$SKYSQL_HA" ]; then
+  if [ -n "$SKYSQL" ]; then
+    if [ -z "$SKYSQL_HOST" ] ; then
+      echo "No SkySQL configuration found !"
+      exit 0
+    else
+      testSingleHost=true
+      urlString="jdbc:mariadb://$SKYSQL_HOST:$SKYSQL_PORT/testj?user=$SKYSQL_USER&password=$SKYSQL_PASSWORD&enablePacketDebug=true&useSsl&serverSslCert=$SKYSQL_SSL_CA"
+        cmd=( mvn clean test $ADDITIONNAL_VARIABLES -DjobId=${TRAVIS_JOB_ID} )
+    fi
   else
-    testSingleHost=true
-    urlString="jdbc:mariadb://$SKYSQL_HOST:$SKYSQL_PORT/testj?user=$SKYSQL_USER&password=$SKYSQL_PASSWORD&enablePacketDebug=true&useSsl&serverSslCert=$SKYSQL_SSL_CA"
-
-    cmd=( mvn clean test $ADDITIONNAL_VARIABLES -DjobId=${TRAVIS_JOB_ID} )
+    if [ -z "$SKYSQL_HA_HOST" ] ; then
+      echo "No SkySQL HA configuration found !"
+      exit 0
+    else
+      testSingleHost=true
+      urlString="jdbc:mariadb://$SKYSQL_HA_HOST:$SKYSQL_HA_PORT/testj?user=$SKYSQL_HA_USER&password=$SKYSQL_HA_PASSWORD&enablePacketDebug=true&useSsl&serverSslCert=$SKYSQL_HA_SSL_CA"
+      cmd=( mvn clean test $ADDITIONNAL_VARIABLES -DjobId=${TRAVIS_JOB_ID} )
+    fi
   fi
 
 else
@@ -177,10 +186,18 @@ fi
 ###################################################################################################################
 # run test suite
 ###################################################################################################################
-echo "Running coveralls for JDK version: $TRAVIS_JDK_VERSION"
-cmd+=( -DdbUrl="$urlString" )
-cmd+=( -DtestSingleHost="$testSingleHost" )
-echo ${cmd}
 
+if [ -z "$BENCH" ] ; then
+  echo "Running coveralls for JDK version: $TRAVIS_JDK_VERSION"
+  cmd+=( -DdbUrl="$urlString" )
+  cmd+=( -DtestSingleHost="$testSingleHost" )
+  echo ${cmd}
+
+  "${cmd[@]}"
+
+else
+  echo "Running benchmarks"
+  mvn clean package -P bench -Dmaven.test.skip
+  java -Duser.country=US -Duser.language=en -DTEST_PORT=3305 -DTEST_HOST=mariadb.example.com -DTEST_USERNAME=bob -jar target/benchmarks.jar
+fi
 
-"${cmd[@]}"

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## [2.7.1](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.1) (23 Nov. 2020)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.7.0...2.7.1)
+
+* CONJ-834 use of BULK batch is conditioned by capability, not checking server version 
+* CONJ-835 GSS Imports set in OSGI Bundle
+* CONJ-839 Wrong exception message when rewriteBatchedStatements is enabled
+* CONJ-841 ResultSetMetaData::getColumnTypeName() returns incorrect type name for LONGTEXT
+* CONJ-842 Byte array parameters are now send as long data
+* CONJ-837 prepared statement cache leak on ResultSet CONCUR_UPDATABLE concurrency
+* CONJ-843 ParameterMetaData::getParameterType for CallableStatement parameter return expected "BINARY" value for BINARY type
+
+minor:
+* CONJ-845 test suite now test SkySQL with replication setting
+* CONJ-838 have a 'replica' alias for 'slave' connection option
+
+
 ## [2.7.0](https://github.com/mariadb-corporation/mariadb-connector-j/tree/2.7.0) (24 Sep. 2020)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.2...2.7.0)
 

appveyor-download.bat

@@ -2,12 +2,11 @@
 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% 
+curl -fLsS -o server.msi %archive%
 
 if %ERRORLEVEL% == 0 goto end
 
-
-curl -fsS -o server.msi %last%
+curl -fLsS -o server.msi %last%
 if %ERRORLEVEL% == 0  goto end
 
 echo Failure Reason Given is %errorlevel%