bump version 2.4.4

mariadb-corporation · Sep 13, 2019 · ece873b · ece873b
1 parent fa120f2
commit ece873b
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ Tracker link <a href="https://jira.mariadb.org/projects/CONJ/issues/">https://ji
 |:------------:|:-------------------------:|
 | 6 | 1.7.4 |
 | 7 | 1.7.4 |
-| 8+ | 2.4.3 |
+| 8+ | 2.4.4 |
 
 The driver (jar) can be downloaded from [mariadb connector download](https://mariadb.com/products/connectors-plugins)
 or maven : 

diff --git a/documentation/changelog.creole b/documentation/changelog.creole
@@ -1,4 +1,11 @@
 
+== 2.4.4 - Released on 14 Sept. 2019
+
+* [CONJ-724] Do not ignore the Calendar parameter in ResultSet#getTime(int, Calendar)
+* [CONJ-725] Connection Failure when using PAM authenticated user on 10.4 MariaDB server
+* [CONJ-729] master-slave regression: commit on read-only server Executed only when there is an active transaction on master connection
+* [CONJ-726] removing possible NPE after failover on aurora cluster
+
 == 2.4.3 - Released on 02 Jul. 2019
 
 * [CONJ-717] conversion function support for other data type than default MariaDB conversion type

diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
     <artifactId>mariadb-java-client</artifactId>
     <packaging>jar</packaging>
     <name>mariadb-java-client</name>
-    <version>2.5.0-SNAPSHOT</version>
+    <version>2.4.4</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 
@@ -70,9 +70,9 @@
         <checkstyleVersion>8.18</checkstyleVersion>
         <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
         <driver.version.major>2</driver.version.major>
-        <driver.version.minor>5</driver.version.minor>
-        <driver.version.patch>0</driver.version.patch>
-        <driver.version.qualifier>-SNAPSHOT</driver.version.qualifier>
+        <driver.version.minor>4</driver.version.minor>
+        <driver.version.patch>4</driver.version.patch>
+        <driver.version.qualifier></driver.version.qualifier>
     </properties>
 
     <licenses>

diff --git a/src/main/java/org/mariadb/jdbc/UrlParser.java b/src/main/java/org/mariadb/jdbc/UrlParser.java
@@ -105,6 +105,14 @@ public class UrlParser implements Cloneable {
   private UrlParser() {
   }
 
+  /**
+   * Constructor.
+   *
+   * @param database database
+   * @param addresses list of hosts
+   * @param options connection option
+   * @param haMode High availability mode
+   */
   public UrlParser(String database, List<HostAddress> addresses, Options options,
       HaMode haMode) {
     this.options = options;

diff --git a/src/main/java/org/mariadb/jdbc/internal/failover/impl/AuroraListener.java b/src/main/java/org/mariadb/jdbc/internal/failover/impl/AuroraListener.java
@@ -415,7 +415,9 @@ private HostAddress searchForMasterHostAddress(Protocol protocol, List<HostAddre
       masterHostAddress = new HostAddress(masterHostName + "." + clusterDnsSuffix,
           protocol.getPort(), null);
       loopAddress.add(masterHostAddress);
-      if (!hostAddresses.contains(masterHostAddress)) hostAddresses.add(masterHostAddress);
+      if (!hostAddresses.contains(masterHostAddress)) {
+        hostAddresses.add(masterHostAddress);
+      }
       return masterHostAddress;
     }
 

diff --git a/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java b/src/main/java/org/mariadb/jdbc/internal/util/constant/Version.java
@@ -53,9 +53,9 @@
 package org.mariadb.jdbc.internal.util.constant;
 
 public final class Version {
-  public static final String version = "2.5.0-SNAPSHOT";
+  public static final String version = "2.4.4";
   public static final int majorVersion = 2;
-  public static final int minorVersion = 5;
-  public static final int patchVersion = 0;
-  public static final String qualifier = "-SNAPSHOT";
+  public static final int minorVersion = 4;
+  public static final int patchVersion = 4;
+  public static final String qualifier = "";
 }