From de7d850135898cc866f0307bfecb1c77fec06b3a Mon Sep 17 00:00:00 2001
From: diego Dupin <diego.dupin@mariadb.com>
Date: Fri, 18 Mar 2022 14:55:55 +0100
Subject: [PATCH] bump 3.0.4 version

---
 CHANGELOG.md                                  | 21 +++++++++++++++++++
 README.md                                     |  4 ++--
 pom.xml                                       |  2 +-
 .../org/mariadb/jdbc/FunctionStatement.java   |  5 +++++
 .../jdbc/integration/MultiHostTest.java       |  3 +--
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f46ae5fb..b0797d28e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,25 @@
 # Change Log
+## [3.0.4](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.0.4) (Mar 2022)
+[Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.0.3...3.0.4)
+
+* [CONJ-915] javadoc addition
+* [CONJ-921] DatabaseMetadata#getTables with null value for tableNamePattern throws Syntax error
+* [CONJ-922] DECIMAL overflow for long/int/short not throwing exception
+* [CONJ-924] NULL column type might result in java.lang.IllegalArgumentException: Unexpected datatype NULL
+* [CONJ-926] Client restrict authentication to 'mysql_native_password,client_ed25519,auth_gssapi_client' if restrictedAuth parameter is not set
+* [CONJ-924] NULL column test correction
+* [CONJ-923] correctly return 64 bits generated id / updated rows
+* [CONJ-933] load-balancing failover doesn't timeout
+* [CONJ-935] Connection.getMetaData() returns MariaDbClob instead of String
+* [CONJ-937] metadata getColumnTypeName wrong return type
+* [CONJ-934] MariaDbDataSource is sensitive to the order of setting of username and password
+* [CONJ-932] Login packet now use recommended length encoded value for connection attributes
+* [CONJ-925] missing OSGI infos
+* [CONJ-945] ensure retry is limited by retriesAllDown
+* [CONJ-940] Permit updating rows when not having primary info on metadata (Xpand)
+* [CONJ-939] add Xpand testing
+
+
 ## [3.0.3](https://github.com/mariadb-corporation/mariadb-connector-j/tree/3.0.3) (Jan 2022)
 [Full Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.0.2-rc...3.0.3)
 
diff --git a/README.md b/README.md
index fef3cbf57..b2296058c 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ or maven :
 <dependency>
 	<groupId>org.mariadb.jdbc</groupId>
 	<artifactId>mariadb-java-client</artifactId>
-	<version>3.0.3</version>
+	<version>3.0.4</version>
 </dependency>
 ```
 
@@ -46,7 +46,7 @@ Development snapshot are available on sonatype nexus repository
     <dependency>
         <groupId>org.mariadb.jdbc</groupId>
         <artifactId>mariadb-java-client</artifactId>
-        <version>3.0.4-SNAPSHOT</version>
+        <version>3.0.5-SNAPSHOT</version>
     </dependency>
 </dependencies>
 ```
diff --git a/pom.xml b/pom.xml
index e9080eaae..ccbc8413f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>3.0.4</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 
diff --git a/src/main/java/org/mariadb/jdbc/FunctionStatement.java b/src/main/java/org/mariadb/jdbc/FunctionStatement.java
index 189750d31..73cfb1837 100644
--- a/src/main/java/org/mariadb/jdbc/FunctionStatement.java
+++ b/src/main/java/org/mariadb/jdbc/FunctionStatement.java
@@ -76,6 +76,11 @@ protected void executeInternal() throws SQLException {
     super.executeInternal();
   }
 
+  /**
+   * Ensures that returning value is not taken as a parameter.
+   *
+   * @throws SQLException if any exception
+   */
   protected void preValidParameters() throws SQLException {
     // remove first parameter, as it's an output param only
     Parameters newParameters = new ParameterList(parameters.size() - 1);
diff --git a/src/test/java/org/mariadb/jdbc/integration/MultiHostTest.java b/src/test/java/org/mariadb/jdbc/integration/MultiHostTest.java
index 7cf59e57a..18660ca36 100644
--- a/src/test/java/org/mariadb/jdbc/integration/MultiHostTest.java
+++ b/src/test/java/org/mariadb/jdbc/integration/MultiHostTest.java
@@ -246,8 +246,7 @@ public void masterFailover() throws Exception {
     try (Connection con =
         (Connection)
             DriverManager.getConnection(
-                url
-                    + "&retriesAllDown=4&connectTimeout=20&deniedListTimeout=20")) {
+                url + "&retriesAllDown=4&connectTimeout=20&deniedListTimeout=20")) {
       Statement stmt = con.createStatement();
       con.setAutoCommit(false);
       stmt.execute("START TRANSACTION");