Merge pull request #140 from xuwei-k/username-key

s/db.default.user/db.default.username
t2v · Jul 6, 2015 · 5fa0adc · 5fa0adc
2 parents ea86dfa + 0a9cc64
commit 5fa0adc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -95,7 +95,7 @@ object ApplicationBuild extends Build {
  libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-initializer" % "2.4.0",
  libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-dbapi-adapter" % "2.4.0",
  libraryDependencies += "org.scalikejdbc" %% "scalikejdbc-play-fixture" % "2.4.0",
- libraryDependencies += "org.flywaydb" %% "flyway-play" % "2.0.0",
+ libraryDependencies += "org.flywaydb" %% "flyway-play" % "2.0.1",
  TwirlKeys.templateImports in Compile ++= Seq(
  "jp.t2v.lab.play2.auth.sample._",
  "play.api.data.Form",
@@ -135,7 +135,7 @@ object ApplicationBuild extends Build {
  libraryDependencies ++= Seq(
  "com.typesafe.play" %% "play-ws" % playVersion,
  "com.typesafe.play" %% "play-cache" % playVersion,
- "org.flywaydb" %% "flyway-play" % "2.0.0",
+ "org.flywaydb" %% "flyway-play" % "2.0.1",
  "org.scalikejdbc" %% "scalikejdbc" % "2.2.7",
  "org.scalikejdbc" %% "scalikejdbc-config" % "2.2.7",
  "org.scalikejdbc" %% "scalikejdbc-syntax-support-macro" % "2.2.7",

diff --git a/sample/conf/application.conf b/sample/conf/application.conf
@@ -24,7 +24,7 @@ application.langs="ja"
 #
 db.default.driver=org.h2.Driver
 db.default.url="jdbc:h2:mem:play;DB_CLOSE_DELAY=-1"
-db.default.user=sa
+db.default.username=sa
 db.default.password=""
 
 # Connection Pool settings

diff --git a/social-sample/conf/application.conf b/social-sample/conf/application.conf
@@ -20,11 +20,11 @@ logger.com.github.tototoshi.play.social = DEBUG
 
 db.default.driver=org.h2.Driver
 db.default.url="jdbc:h2:mem:play;DB_CLOSE_DELAY=-1"
-db.default.user=sa
+db.default.username=sa
 db.default.password=""
 
 dbplugin=disabled
 evolutionplugin=disabled
 
 # play.modules.enabled += "scalikejdbc.PlayModule"
-# play.modules.enabled += "org.flywaydb.play.PlayModule"
+# play.modules.enabled += "org.flywaydb.play.PlayModule"