Merge branch 'release/0.5.5'

Author: seratch

.travis.yml

@@ -1,7 +1,7 @@
 language: scala
 scala:
 - 2.10.4
-- 2.11.4
+- 2.11.5
 script: sbt clean coverage test
 after_success: sbt coveralls
 addons:

core/src/main/scala/scalikejdbc/async/AsyncConnectionPool.scala

@@ -34,8 +34,8 @@ abstract class AsyncConnectionPool(
     username = user,
     host = jdbcUrl.host,
     port = jdbcUrl.port,
-    password = Option(password),
-    database = Option(jdbcUrl.database)
+    password = Option(password).filterNot(_.trim.isEmpty),
+    database = Option(jdbcUrl.database).filterNot(_.trim.isEmpty)
   )
 
   /**

project/Build.scala

@@ -3,8 +3,8 @@ import Keys._
 
 object ScalikeJDBCAsyncProject extends Build {
 
-  lazy val _version = "0.5.4"
-  lazy val scalikejdbcVersion = "2.2.1"
+  lazy val _version = "0.5.5"
+  lazy val scalikejdbcVersion = "2.2.2"
   lazy val mauricioVersion = "0.2.15"
   lazy val defaultPlayVersion = play.core.PlayVersion.current
 
@@ -15,8 +15,8 @@ object ScalikeJDBCAsyncProject extends Build {
       organization := "org.scalikejdbc",
       name := "scalikejdbc-async",
       version := _version,
-      scalaVersion := "2.11.4",
-      crossScalaVersions := Seq("2.11.4", "2.10.4"),
+      scalaVersion := "2.11.5",
+      crossScalaVersions := Seq("2.11.5", "2.10.4"),
       publishTo <<= version { (v: String) => _publishTo(v) },
       publishMavenStyle := true,
       resolvers ++= _resolvers,
@@ -52,8 +52,8 @@ object ScalikeJDBCAsyncProject extends Build {
       organization := "org.scalikejdbc",
       name := "scalikejdbc-async-play-plugin",
       version := _version,
-      scalaVersion := "2.11.4",
-      crossScalaVersions := Seq("2.11.4", "2.10.4"),
+      scalaVersion := "2.11.5",
+      crossScalaVersions := Seq("2.11.5", "2.10.4"),
       resolvers ++= _resolvers,
       resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/",
       libraryDependencies <++= (scalaVersion) { scalaVersion =>
@@ -87,13 +87,13 @@ object ScalikeJDBCAsyncProject extends Build {
       "com.github.tototoshi" %% "play-flyway"                     % "1.2.0",
       "mysql"                %  "mysql-connector-java"            % "5.1.34",
       "org.json4s"           %% "json4s-ext"                      % "3.2.11",
-      "com.github.tototoshi" %% "play-json4s-native"              % "0.3.0"
+      "com.github.tototoshi" %% "play-json4s-native"              % "0.3.+"
     )
     Project(appName, file("play-sample")).enablePlugins(play.PlayScala).settings(
-      scalaVersion in ThisBuild := "2.11.4",
+      scalaVersion in ThisBuild := "2.11.5",
       libraryDependencies ++= appDependencies,
       resolvers ++= Seq(
-        "sonatype releases"  at "http://oss.sonatype.org/content/repositories/releases"
+        "sonatype releases"  at "https://oss.sonatype.org/content/repositories/releases"
       )
     ).dependsOn(core, playPlugin)
   }
@@ -104,7 +104,7 @@ object ScalikeJDBCAsyncProject extends Build {
     else Some("releases" at nexus + "service/local/staging/deploy/maven2")
   }
   val _resolvers = Seq(
-    "sonatype releases"  at "http://oss.sonatype.org/content/repositories/releases"
+    "sonatype releases"  at "https://oss.sonatype.org/content/repositories/releases"
   )
   val _scalacOptions = Seq("-deprecation", "-unchecked")
   val _pomExtra = <url>http://scalikejdbc.org/</url>

project/plugins.sbt

@@ -3,7 +3,7 @@ addSbtPlugin("org.xerial.sbt"   % "sbt-sonatype"         % "0.2.1")
 addSbtPlugin("com.jsuereth"     % "sbt-pgp"              % "1.0.0")
 addSbtPlugin("com.timushev.sbt" % "sbt-updates"          % "0.1.7")
 addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.7.4")
-addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.0.1")
+addSbtPlugin("org.scoverage"    % "sbt-scoverage"        % "1.0.2")
 addSbtPlugin("org.scoverage"    % "sbt-coveralls"        % "1.0.0.BETA1")
 
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"

release.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-sbt clean "project core" "+ publishSigned" "project play-plugin" "+ publishSigned" sonatypeRelease
+sbt clean "project core" "+ publishSigned" "project play-plugin" "+ publishSigned" #sonatypeRelease