Merge pull request skinny-framework#255 from seratch/bump-deps

Bump minor version of libraryDependencies
pc3b3r · Apr 18, 2015 · 9285f8e · 9285f8e
2 parents b5a06f1 + 6d56c4a
commit 9285f8e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -9,11 +9,12 @@ object SkinnyFrameworkBuild extends Build {
   lazy val scalatraVersion = "2.3.1"
   lazy val json4SVersion = "3.2.11"
   lazy val scalikeJDBCVersion = "2.2.5"
-  lazy val h2Version = "1.4.186"
-  lazy val kuromojiVersion = "5.0.0"
+  lazy val h2Version = "1.4.187"
+  lazy val kuromojiVersion = "5.1.0"
   lazy val mockitoVersion = "1.10.19"
   lazy val jettyVersion = "9.2.10.v20150310"
   lazy val logbackVersion = "1.1.3"
+  lazy val slf4jApiVersion = "1.7.12"
 
   lazy val baseSettings = Seq(
     organization := "org.skinny-framework",
@@ -135,7 +136,7 @@ object SkinnyFrameworkBuild extends Build {
       name := "skinny-orm",
       libraryDependencies ++= scalikejdbcDependencies ++ servletApiDependencies ++ Seq(
         "org.flywaydb"    %  "flyway-core"    % "3.2.1"       % "compile",
-        "org.hibernate"   %  "hibernate-core" % "4.3.8.Final" % "test"
+        "org.hibernate"   %  "hibernate-core" % "4.3.9.Final" % "test"
       ) ++ testDependencies
     )
   ).dependsOn(common)
@@ -166,8 +167,8 @@ object SkinnyFrameworkBuild extends Build {
       name := "skinny-thymeleaf",
       libraryDependencies ++= scalatraDependencies ++ Seq(
         "org.thymeleaf"            %  "thymeleaf"                % "2.1.4.RELEASE" % "compile",
-        "nz.net.ultraq.thymeleaf"  %  "thymeleaf-layout-dialect" % "1.2.7"         % "compile" exclude("org.thymeleaf", "thymeleaf"),
-        "net.sourceforge.nekohtml" %  "nekohtml"                 % "1.9.21"        % "compile"
+        "nz.net.ultraq.thymeleaf"  %  "thymeleaf-layout-dialect" % "1.2.8"         % "compile" exclude("org.thymeleaf", "thymeleaf"),
+        "net.sourceforge.nekohtml" %  "nekohtml"                 % "1.9.22"        % "compile"
       ) ++ testDependencies
     ) ++ _jettyOrbitHack
   ).dependsOn(framework)
@@ -227,20 +228,20 @@ object SkinnyFrameworkBuild extends Build {
     settings = baseSettings ++ Seq(
       name := "skinny-twitter-controller",
       libraryDependencies ++= Seq(
-        "org.twitter4j" % "twitter4j-core" % "4.0.2" % "compile"
+        "org.twitter4j" % "twitter4j-core" % "4.0.3" % "compile"
       ) ++ servletApiDependencies
     )
   ).dependsOn(framework)
 
   lazy val logback = Project(id = "logback", base = file("logback"),
     settings = baseSettings ++ Seq(
       name             := "skinny-logback",
-      version          := "1.0.6-SNAPSHOT",
+      version          := "1.0.7-SNAPSHOT",
       crossPaths       := false,
       autoScalaLibrary := false,
       libraryDependencies ++= Seq(
         "ch.qos.logback" % "logback-classic" % logbackVersion  % "compile" exclude("org.slf4j", "slf4j-api"),
-        "org.slf4j"      % "slf4j-api"       % "1.7.10"        % "compile"
+        "org.slf4j"      % "slf4j-api"       % slf4jApiVersion % "compile"
       )
     )
   )
@@ -338,7 +339,7 @@ object SkinnyFrameworkBuild extends Build {
     "javax.servlet" % "javax.servlet-api" % "3.1.0"  % "provided"
   )
   lazy val slf4jApiDependencies   = Seq(
-    "org.slf4j"     % "slf4j-api"         % "1.7.10" % "compile"
+    "org.slf4j"     % "slf4j-api"         % slf4jApiVersion % "compile"
   )
   lazy val jodaDependencies = Seq(
     "joda-time"     %  "joda-time"        % "2.7"    % "compile",

diff --git a/yeoman-generator-skinny/app/templates/project/Build.scala b/yeoman-generator-skinny/app/templates/project/Build.scala
@@ -35,9 +35,9 @@ object SkinnyAppBuild extends Build {
       "org.skinny-framework"    %% "skinny-framework"    % skinnyVersion,
       "org.skinny-framework"    %% "skinny-assets"       % skinnyVersion,
       "org.skinny-framework"    %% "skinny-task"         % skinnyVersion,
-      "org.skinny-framework"    %  "skinny-logback"      % "1.0.5",
+      "org.skinny-framework"    %  "skinny-logback"      % "1.0.6",
       "org.apache.commons"      %  "commons-dbcp2"       % "2.1",
-      "com.h2database"          %  "h2"                  % "1.4.186",      // your own JDBC driver
+      "com.h2database"          %  "h2"                  % "1.4.187",      // your own JDBC driver
       "org.skinny-framework"    %% "skinny-factory-girl" % skinnyVersion   % "test",
       "org.skinny-framework"    %% "skinny-test"         % skinnyVersion   % "test",
       "org.scalatra"            %% "scalatra-scalatest"  % scalatraVersion % "test",