Merge branch 'release/1.5.0-RC1'

.travis.yml

@@ -7,6 +7,7 @@ jdk:
     - oraclejdk8
     - oraclejdk7
 env:
+    - AURORA=true SINGLEHOST=false
     - MARIA_VERSION=5.5 MAX_ALLOWED_PACKET=8M INNODB_LOG_FILE_SIZE=80M SINGLEHOST=true
     - MARIA_VERSION=5.5 MAX_ALLOWED_PACKET=20M INNODB_LOG_FILE_SIZE=200M SINGLEHOST=true
     - MARIA_VERSION=5.5 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
@@ -16,14 +17,21 @@ env:
     - MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=8M INNODB_LOG_FILE_SIZE=80M SINGLEHOST=true
     - MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=20M INNODB_LOG_FILE_SIZE=200M SINGLEHOST=true
     - MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=REWRITE MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=MULTI MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=BULK_CLIENT MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=NO_BULK_CLIENT MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=NO_BULK_SERVER MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - COMPRESSION=true MARIA_VERSION=10.1 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - TYPE=NO_BULK_SERVER MARIA_VERSION=10.2 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
+    - COMPRESSION=true MARIA_VERSION=10.2 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
     - MYSQL_VERSION=5.7 MAX_ALLOWED_PACKET=8M INNODB_LOG_FILE_SIZE=80M SINGLEHOST=true
     - MYSQL_VERSION=5.7 MAX_ALLOWED_PACKET=20M INNODB_LOG_FILE_SIZE=200M SINGLEHOST=true
     - MYSQL_VERSION=5.7 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
     - MYSQL_VERSION=5.6 MAX_ALLOWED_PACKET=8M INNODB_LOG_FILE_SIZE=80M SINGLEHOST=true
     - MYSQL_VERSION=5.6 MAX_ALLOWED_PACKET=20M INNODB_LOG_FILE_SIZE=200M SINGLEHOST=true
     - MYSQL_VERSION=5.6 MAX_ALLOWED_PACKET=40M INNODB_LOG_FILE_SIZE=400M SINGLEHOST=true
-    - AURORA=true SINGLEHOST=false
-script: mvn test -DtestSingleHost=$SINGLEHOST $ADDITIONNAL_VARIABLES -DjobId=$TRAVIS_JOB_ID -DkeystorePath="/etc/mysql/client-keystore.p12" -DkeystorePassword="kspass"
+script: mvn test $URLSTRING -DtestSingleHost=$SINGLEHOST $ADDITIONNAL_VARIABLES -DjobId=$TRAVIS_JOB_ID -DkeystorePath="/etc/mysql/client-keystore.p12" -DkeystorePassword="kspass"
 cache:
     directories:
         - $HOME/.m2

.travis/before_test.sh

@@ -11,23 +11,42 @@ remove_mysql(){
 }
 remove_mysql
 
+case "$TYPE" in
+ "REWRITE" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&rewriteBatchedStatements=true'
+   ;;
+ "MULTI" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&allowMultiQueries=true'
+   ;;
+ "BULK_CLIENT" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&useBatchMultiSend=true&useServerPrepStmts=false'
+   ;;
+ "NO_BULK_CLIENT" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&useBatchMultiSend=false&useServerPrepStmts=false'
+   ;;
+ "NO_BULK_SERVER" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&useBatchMultiSend=false'
+   ;;
+ "COMPRESSION" )
+   export URLSTRING=-DdbURL='jdbc:mariadb://localhost:3306/testj?user=root&useCompression=true'
+   ;;
+esac;
+
 if [ -n "$AURORA" ]
 then
     # AURORA tests doesn't need an installation
     echo "$MYSQL_VERSION"
 else
     if [ -n "$MYSQL_VERSION" ]
     then
-        export MYSQ_GPG_KEY=5072E1F5
         sudo tee /etc/apt/sources.list.d/mysql.list << END
 deb http://repo.mysql.com/apt/ubuntu/ precise mysql-$MYSQL_VERSION
 deb-src http://repo.mysql.com/apt/ubuntu/ precise mysql-$MYSQL_VERSION
 END
+        sudo apt-key adv --keyserver pgp.mit.edu --recv-keys 5072E1F5
 
-        sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys $MYSQ_GPG_KEY
-
-        sudo apt-get -qq update
-        sudo apt-get -qq install mysql-server
+        sudo apt-get -qq update --force-yes
+        sudo apt-get -qq install mysql-server --force-yes
 
         dpkg -l|grep ^ii|grep mysql-server|grep ${MYSQL_VERSION/-dmr/}
 

README.md

@@ -27,6 +27,17 @@ or maven :
 </dependency>
 ```
 
+Current release candidate :
+
+```script
+<dependency>
+	<groupId>org.mariadb.jdbc</groupId>
+	<artifactId>mariadb-java-client</artifactId>
+	<version>1.5.0-RC1</version>
+</dependency>
+```
+
+
 Development snapshot are available on sonatype nexus repository  
 ```script
 <repositories>
@@ -41,20 +52,21 @@ Development snapshot are available on sonatype nexus repository
     <dependency>
         <groupId>org.mariadb.jdbc</groupId>
         <artifactId>mariadb-java-client</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </dependency>
 </dependencies>
 ```
 
 ## Documentation
 
 For a Getting started guide, API docs, recipes,  etc. see the 
-* [About MariaDB connector/J](/documentation/About-MariaDB-Connector-J.md)
-* [Use MariaDB connector/j driver](/documentation/Use-MariaDB-Connector-j-driver.md)
-* [Failover and high-availability](/documentation/Failover-and-high-availability.md)
+* [About MariaDB connector/J](/documentation/about-mariadb-connector-j.creole)
+* [Use MariaDB connector/j driver](/documentation/use-mariadb-connector-j-driver.creole)
+* [Changelog](/documentation/changelog.creole)
+* [Failover and high-availability](/documentation/failover-and-high-availability-with-mariadb-connector-j.creole)
 
 
 ## Contributing
 To get started with a development installation and learn more about contributing, please follow the instructions at our 
-[Developers Guide.](/documentation/Developers-Guide.md)
+[Developers Guide.](/documentation/developers-guide.creole)
 

build_release.bat

@@ -13,4 +13,4 @@ call %BINDIR%\mysqladmin -uroot shutdown
 #mvn package -Dmaven.test.skip=true -P test,package-source
 
 #deployment
-#mvn deploy -Dmaven.test.skip=true -Dpackage-source=true
+#mvn clean deploy -Dmaven.test.skip=true -Dpackage-source=true