diff --git a/README.md b/README.md index bbefb45a1..00210d3a6 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ or maven : org.mariadb.jdbc mariadb-java-client - 1.4.3 + 1.4.4 ``` diff --git a/documentation/Changelog.md b/documentation/Changelog.md index 77f0a648e..a97feb568 100644 --- a/documentation/Changelog.md +++ b/documentation/Changelog.md @@ -7,7 +7,8 @@ --- ## 1.4.4 -Unreleased +Released on 29 april 2016 +* [CONJ-289] PrepareStatement on master reconnection after a failover * [CONJ-288] using SHOW VARIABLES to replace SELECT on connection to permit connection on a galera non primary node ## 1.4.3 diff --git a/pom.xml b/pom.xml index 65dacfb72..fb8a30c88 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ mariadb-java-client jar mariadb-java-client - 1.4.4-SNAPSHOT + 1.4.4 JDBC driver for MariaDB and MySQL https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java index 3e724aa4b..66d4f19e5 100644 --- a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java +++ b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java @@ -85,6 +85,7 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS import java.util.concurrent.locks.ReentrantLock; import java.util.regex.Pattern; +@SuppressWarnings("deprecation") public class MariaSelectResultSet implements ResultSet { public static final MariaSelectResultSet EMPTY = createEmptyResultSet(); 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 3ba0c01f0..b5cfe0dfd 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 @@ -51,10 +51,10 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS package org.mariadb.jdbc.internal.util.constant; public final class Version { - public static final String version = "1.4.4-SNAPSHOT"; + public static final String version = "1.4.4"; public static final int majorVersion = 1; public static final int minorVersion = 4; public static final int patchVersion = 4; - 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/DatatypeTest.java b/src/test/java/org/mariadb/jdbc/DatatypeTest.java index e3e08f25d..6872dc429 100644 --- a/src/test/java/org/mariadb/jdbc/DatatypeTest.java +++ b/src/test/java/org/mariadb/jdbc/DatatypeTest.java @@ -800,6 +800,7 @@ private void testBitResult(ResultSet rs) throws SQLException { } @Test + @SuppressWarnings("deprecation") public void testNullTimePreparedStatement() throws Exception { sharedConnection.createStatement().execute("insert into time_period(id, start, end) values(1, '00:00:00', '08:00:00');"); final String sql = "SELECT id, start, end FROM time_period WHERE id=?"; diff --git a/src/test/java/org/mariadb/jdbc/TimezoneDaylightSavingTimeTest.java b/src/test/java/org/mariadb/jdbc/TimezoneDaylightSavingTimeTest.java index e82f67308..ac1d40018 100644 --- a/src/test/java/org/mariadb/jdbc/TimezoneDaylightSavingTimeTest.java +++ b/src/test/java/org/mariadb/jdbc/TimezoneDaylightSavingTimeTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +@SuppressWarnings("deprecation") public class TimezoneDaylightSavingTimeTest extends BaseTest { private static Locale previousFormatLocale;