bump 2.5.0

mariadb-corporation · Oct 2, 2019 · 5128ae3 · 5128ae3
1 parent 8c53983
commit 5128ae3
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 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.4 |
+| 8+ | 2.5.0 |
 
 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,3 +1,13 @@
+== 2.5.0 - Released on 02 Oct. 2019
+
+* [CONJ-663] Client authentication plugins are now defined as services. The driver has 2 new plugins `caching_sha2_password` and `sha256_password plugin` for MySQL compatibility
+* [CONJ-733] Credential service: AWS IAM authentication
+* [CONJ-727] Support configuration of custom SSLSocketFactory
+* [CONJ-561] JDBC 4.3 partial implementation java.sql.Statement methods isSimpleIdentifier, enquoteIdentifier, enquoteLiteral and enquoteNCharLiteral
+* [CONJ-692] ConnectionPoolDataSource interface addition to MariaDbPoolDataSource
+* [CONJ-563] closing possible option batch thread on driver deregistration.
+* [CONJ-732] Driver getPropertyInfo returns no options information when url is empty
+* [CONJ-734] DatabaseMetaData.getSchemaTerm now return "schema", not empty string
 
 == 2.4.4 - Released on 14 Sept. 2019
 

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.5.0</version>
     <description>JDBC driver for MariaDB and MySQL</description>
     <url>https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/</url>
 
@@ -72,7 +72,7 @@
         <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.qualifier></driver.version.qualifier>
     </properties>
 
     <licenses>

diff --git a/src/main/java/org/mariadb/jdbc/credential/aws/AwsIamCredentialPlugin.java b/src/main/java/org/mariadb/jdbc/credential/aws/AwsIamCredentialPlugin.java
@@ -35,7 +35,7 @@
 /**
  * Permit AWS database IAM authentication.
  *
- * <p>Token is generated and from IAM credential and region.
+ * <p>Token is generated using IAM credential and region.
  *
  * <p>Implementation use SDK DefaultAWSCredentialsProviderChain and DefaultAwsRegionProviderChain
  * (environment variable / system properties, files, ...) or using connection string options :
@@ -44,7 +44,7 @@
  * @see <a
  *     href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html">DefaultAWSCredentialsProviderChain</a>
  * @see <a
- *     href="https://docs.aws.amazon.com/AWSJavaSDK/latest/javadoc/com/amazonaws/auth/DefaultAWSCredentialsProviderChain.html">DefaultAwsRegionProviderChain</a>
+ *     href="https://sdk.amazonaws.com/java/api/latest/software/amazon/awssdk/regions/providers/DefaultAwsRegionProviderChain.html">DefaultAwsRegionProviderChain</a>
  */
 public class AwsIamCredentialPlugin implements CredentialPlugin {
 

diff --git a/src/main/java/org/mariadb/jdbc/credential/env/EnvCredentialPlugin.java b/src/main/java/org/mariadb/jdbc/credential/env/EnvCredentialPlugin.java
@@ -30,7 +30,7 @@
  *
  * <p>default implementation use environment variable MARIADB_USER and MARIADB_PWD
  *
- * <p>example : `jdbc:mariadb://host/db?identityType=ENV`
+ * <p>example : `jdbc:mariadb://host/db?credentialType=ENV`
  *
  * <p>2 options `userKey` and `pwdKey` permits to indicate which environment variable to use.
  */

diff --git a/src/main/java/org/mariadb/jdbc/credential/system/PropertiesCredentialPlugin.java b/src/main/java/org/mariadb/jdbc/credential/system/PropertiesCredentialPlugin.java
@@ -40,7 +40,7 @@
  *
  * <p>default implementation use system properties `mariadb.user` and `mariadb.pwd`
  *
- * <p>example : `jdbc:mariadb://host/db?identityType=PROPERTY`
+ * <p>example : `jdbc:mariadb://host/db?credentialType=PROPERTY`
  *
  * <p>2 options `userKey` and `pwdKey` permits to indicate which system properties to use .
  */

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.5.0";
   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 String qualifier = "";
 }