diff --git a/.travis/before_test.sh b/.travis/before_test.sh index fcc05c7a4..5d69e88d5 100644 --- a/.travis/before_test.sh +++ b/.travis/before_test.sh @@ -85,7 +85,7 @@ sudo service mysql start #Adding sleep time if mysql DB. If not SSL not totally initialized when launching tests if [ "x$MYSQL_VERSION" != "x" ] then - sleep 10 + sleep 20 fi cat /etc/mysql/my.cnf diff --git a/pom.xml b/pom.xml index a5243a8ff..204f8b11f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ mariadb-java-client jar mariadb-java-client - 1.2.1-SNAPSHOT + 1.2.2-SNAPSHOT JDBC driver for MariaDB and MySQL https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ @@ -28,6 +28,12 @@ JIRA https://mariadb.atlassian.net/browse/CONJ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + wlad @@ -85,6 +91,33 @@ + + org.apache.maven.plugins + maven-source-plugin + 2.4 + + + attach-sources + + jar + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.3 + + + attach-javadocs + + jar + + + + org.codehaus.mojo exec-maven-plugin @@ -101,6 +134,38 @@ + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + sign-artifacts + verify + + sign + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.6 + true + + ossrh + https://oss.sonatype.org/ + false + + @@ -144,31 +209,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 2.4 - - - - jar - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.3 - - - attach-javadocs - - jar - - - - org.codehaus.mojo build-helper-maven-plugin diff --git a/src/main/java/org/mariadb/jdbc/Version.java b/src/main/java/org/mariadb/jdbc/Version.java index c1cc7226f..0f5aaaa03 100644 --- a/src/main/java/org/mariadb/jdbc/Version.java +++ b/src/main/java/org/mariadb/jdbc/Version.java @@ -1,10 +1,10 @@ package org.mariadb.jdbc; public final class Version { - public static final String version = "1.2.1-SNAPSHOT"; + public static final String version = "1.2.2-SNAPSHOT"; public static final int majorVersion = 1; public static final int minorVersion = 2; - public static final int patchVersion = 1; + public static final int patchVersion = 2; public static final String qualifier = "SNAPSHOT"; } \ No newline at end of file