From c9a86cf7b9b5759bfb3553a89250d5dfd0a615eb Mon Sep 17 00:00:00 2001 From: rusher Date: Mon, 17 Jun 2019 14:20:07 +0200 Subject: [PATCH] bump 2.4.2 --- README.md | 2 +- documentation/changelog.creole | 15 +++++++++++++++ pom.xml | 4 ++-- src/main/java/org/mariadb/jdbc/UrlParser.java | 4 +++- .../jdbc/internal/util/constant/Version.java | 4 ++-- src/test/java/org/mariadb/jdbc/DriverTest.java | 2 +- .../org/mariadb/jdbc/LocalInfileDisableTest.java | 2 +- .../mariadb/jdbc/LocalInfileInputStreamTest.java | 16 ++++++++-------- .../java/org/mariadb/jdbc/StatementTest.java | 6 ++++-- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 4a70e1f8b..b9f9a1aa4 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Tracker link https://ji |:------------:|:-------------------------:| | 6 | 1.7.4 | | 7 | 1.7.4 | -| 8+ | 2.4.1 | +| 8+ | 2.4.2 | 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 index a1d6adbd8..56606e24a 100644 --- a/documentation/changelog.creole +++ b/documentation/changelog.creole @@ -1,4 +1,19 @@ +== 2.4.2 - Released on 17 Jun. 2019 + +Security +* [CONJ-679] parse Query when receiving LOAD LOCAL INFILE + +Bugs +* [CONJ-703] ClassNotFoundException when trying to connect using two-authentication in an OSGI environment. +* [CONJ-711] Xid format id is unsigned integer, currently sending as signed value. +* [CONJ-700] autoReconnect=true on Basic Failover doesn't reconnect +* [CONJ-707] failover might throw an unexpected exception with using "failover"/"sequential" configuration on socket error +* [CONJ-709] includeThreadDumpInDeadlockExceptions is thrown only if option includeInnodbStatusInDeadlockExceptions is set +* [CONJ-710] Throw complete stackTrace when having an exception on XA Commands +* [CONJ-714] Error on connection on galera server when in detached mode. +* [CONJ-701] typo in error message in SelectResultSet.java + == 2.4.1 - Released on 15 Mar. 2019 Evolutions diff --git a/pom.xml b/pom.xml index d79553d02..74561d4ec 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ mariadb-java-client jar mariadb-java-client - 2.4.2-SNAPSHOT + 2.4.2 JDBC driver for MariaDB and MySQL https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ @@ -72,7 +72,7 @@ 2 4 2 - -SNAPSHOT + diff --git a/src/main/java/org/mariadb/jdbc/UrlParser.java b/src/main/java/org/mariadb/jdbc/UrlParser.java index 1201c8816..6dde03064 100644 --- a/src/main/java/org/mariadb/jdbc/UrlParser.java +++ b/src/main/java/org/mariadb/jdbc/UrlParser.java @@ -283,7 +283,9 @@ private static HaMode parseHaMode(String url, int separator) { try { String haModeString = url.substring(secondColonPos + 1, thirdColonPos).toUpperCase(Locale.ROOT); - if ("FAILOVER".equals(haModeString)) haModeString = "LOADBALANCE"; + if ("FAILOVER".equals(haModeString)) { + haModeString = "LOADBALANCE"; + } return HaMode.valueOf(haModeString); } catch (IllegalArgumentException i) { throw new IllegalArgumentException( 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 index 08569ccfb..e931a5170 100644 --- 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.4.2-SNAPSHOT"; + public static final String version = "2.4.2"; public static final int majorVersion = 2; public static final int minorVersion = 4; public static final int patchVersion = 2; - public static final String qualifier = "-SNAPSHOT"; + public static final String qualifier = ""; } \ No newline at end of file diff --git a/src/test/java/org/mariadb/jdbc/DriverTest.java b/src/test/java/org/mariadb/jdbc/DriverTest.java index e0324aead..d7df4f720 100644 --- a/src/test/java/org/mariadb/jdbc/DriverTest.java +++ b/src/test/java/org/mariadb/jdbc/DriverTest.java @@ -1447,7 +1447,7 @@ public void localSocket() throws Exception { rs = connection.createStatement().executeQuery("select 1"); assertTrue(rs.next()); } - st.execute("DROP user testSocket@'" + ((hostname == null) ? "localhost" : hostname) +"'"); + st.execute("DROP user testSocket@'" + ((hostname == null) ? "localhost" : hostname) + "'"); } @Test diff --git a/src/test/java/org/mariadb/jdbc/LocalInfileDisableTest.java b/src/test/java/org/mariadb/jdbc/LocalInfileDisableTest.java index 9f0efa66a..5296a2899 100644 --- a/src/test/java/org/mariadb/jdbc/LocalInfileDisableTest.java +++ b/src/test/java/org/mariadb/jdbc/LocalInfileDisableTest.java @@ -77,7 +77,7 @@ public static void initClass() throws SQLException { @Test public void testLocalInfileWithoutInputStream() throws SQLException { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); try (Connection connection = setConnection("&allowLocalInfile=false")) { Exception ex = null; diff --git a/src/test/java/org/mariadb/jdbc/LocalInfileInputStreamTest.java b/src/test/java/org/mariadb/jdbc/LocalInfileInputStreamTest.java index d3892c4b2..fe32b2e56 100644 --- a/src/test/java/org/mariadb/jdbc/LocalInfileInputStreamTest.java +++ b/src/test/java/org/mariadb/jdbc/LocalInfileInputStreamTest.java @@ -93,7 +93,7 @@ public static void initClass() throws SQLException { @Test public void testLocalInfileInputStream() throws SQLException { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); try (Connection connection = setConnection("&allowLocalInfile=true")) { try (Statement st = connection.createStatement()) { @@ -124,7 +124,7 @@ public void testLocalInfileInputStream() throws SQLException { @Test public void testLocalInfileValidInterceptor() throws Exception { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); File temp = File.createTempFile("validateInfile", ".txt"); StringBuilder builder = new StringBuilder(); @@ -141,7 +141,7 @@ public void testLocalInfileValidInterceptor() throws Exception { @Test public void testLocalInfileUnValidInterceptor() throws Exception { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); File temp = File.createTempFile("localInfile", ".txt"); StringBuilder builder = new StringBuilder(); @@ -191,7 +191,7 @@ private void testLocalInfile(Connection connection, String file) throws SQLExcep @Test public void loadDataInfileEmpty() throws SQLException, IOException { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); // Create temp file. File temp = File.createTempFile("validateInfile", ".tmp"); @@ -210,7 +210,7 @@ public void loadDataInfileEmpty() throws SQLException, IOException { @Test public void testPrepareLocalInfileWithoutInputStream() throws SQLException { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); try (Connection connection = setConnection("&allowLocalInfile=true")) { try { @@ -296,7 +296,7 @@ private void checkBigLocalInfile(long fileSize) throws Exception { @Test public void testSmallBigLocalInfileInputStream() throws Exception { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); checkBigLocalInfile(256); } @@ -304,7 +304,7 @@ public void testSmallBigLocalInfileInputStream() throws Exception { @Test public void test2xBigLocalInfileInputStream() throws Exception { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); Assume.assumeTrue(checkMaxAllowedPacketMore40m("test2xBigLocalInfileInputStream")); checkBigLocalInfile(16777216 * 2); @@ -313,7 +313,7 @@ public void test2xBigLocalInfileInputStream() throws Exception { @Test public void testMoreThanMaxAllowedPacketLocalInfileInputStream() throws Exception { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); Assume.assumeTrue(System.getenv("MAXSCALE_VERSION") == null); Assume.assumeFalse(sharedIsAurora()); diff --git a/src/test/java/org/mariadb/jdbc/StatementTest.java b/src/test/java/org/mariadb/jdbc/StatementTest.java index 07a78644f..c6619eee1 100644 --- a/src/test/java/org/mariadb/jdbc/StatementTest.java +++ b/src/test/java/org/mariadb/jdbc/StatementTest.java @@ -277,7 +277,7 @@ public void testNoPartitionForGivenValue() throws SQLException { @Test public void testLoadDataInvalidColumn() throws SQLException { Assume.assumeFalse( - (isMariadbServer() && minVersion(10, 4, 0) ) + (isMariadbServer() && minVersion(10, 4, 0)) || (!isMariadbServer() && minVersion(8, 0, 3))); try (Connection connection = setConnection("&allowLocalInfile=true")) { Statement statement = connection.createStatement(); @@ -313,7 +313,9 @@ public void testLoadDataInvalidColumn() throws SQLException { } assertEquals(ER_LOAD_DATA_INVALID_COLUMN_STATE, sqlException.getSQLState()); - //otherwise, localInfileInputStream will not be null, which cause false logic in readLocalInfilePacket and test like LocalInfileInputStreamTest#testLocalInfileUnValidInterceptor will fail if run after it + //otherwise, localInfileInputStream will not be null, + // which cause false logic in readLocalInfilePacket + // and test like LocalInfileInputStreamTest#testLocalInfileUnValidInterceptor will fail if run after it mysqlStatement.setLocalInfileInputStream(null); }