Upgrade depedencies to actual versions. Use Lift milestone instead of…

… snapshot.
btd · Feb 20, 2013 · 7bfa041 · 7bfa041
1 parent 621a8a2
commit 7bfa041
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/build.sbt b/build.sbt
@@ -17,26 +17,27 @@ resolvers ++= Seq (
   )
 
 
-libraryDependencies ++= Seq (
-  "net.databinder"      %% "dispatch-nio"                 % "0.8.7",
+libraryDependencies ++= {
+  val liftVersion = "2.5-M4"
+  Seq (
+  "net.databinder"      %% "dispatch-nio"                 % "0.8.9",
   "org.mindrot"         % "jbcrypt"                       % "0.3m",
-  "org.eclipse.jgit"    % "org.eclipse.jgit"              % "1.3.0.201202151440-r",
-  "org.apache.sshd"     % "sshd-core"                     % "0.6.0",
-  "org.apache.mina"     % "mina-core"                     % "2.0.4",
-  "commons-codec"       % "commons-codec"                 % "1.5",
+  "org.eclipse.jgit"    % "org.eclipse.jgit"              % "2.2.0.201212191850-r",
+  "org.apache.sshd"     % "sshd-core"                     % "0.8.0",
+  "org.apache.mina"     % "mina-core"                     % "2.0.7",
+  "commons-codec"       % "commons-codec"                 % "1.7",
   "org.lunatool"        %% "scala-linguist"               % "1.3",
-  "org.quartz-scheduler" % "quartz"                       % "2.1.3",
-  "commons-io"          % "commons-io"                    % "2.1",
+  "org.quartz-scheduler" % "quartz"                       % "2.1.6",
+  "commons-io"          % "commons-io"                    % "2.4",
   "javax.transaction"   % "jta"                           % "1.1"                    % "container",
-  "junit"               % "junit"                         % "4.8"                    % "test",
-  "net.liftweb"         %% "lift-webkit"                  % "2.5-SNAPSHOT"           % "compile",
-  "net.liftweb"         %% "lift-db"                      % "2.5-SNAPSHOT"           % "compile",
-  "net.liftweb"         %% "lift-mongodb"                 % "2.5-SNAPSHOT"           % "compile",
-  "net.liftweb"         %% "lift-mongodb-record"          % "2.5-SNAPSHOT"           % "compile",
+  "net.liftweb"         %% "lift-webkit"                  % liftVersion              % "compile",
+  "net.liftweb"         %% "lift-db"                      % liftVersion              % "compile",
+  "net.liftweb"         %% "lift-mongodb"                 % liftVersion              % "compile",
+  "net.liftweb"         %% "lift-mongodb-record"          % liftVersion              % "compile",
   "com.foursquare"      %% "rogue"                        % "1.1.6"                  intransitive(),
   "org.eclipse.jetty"   % "jetty-webapp"                  % "8.0.4.v20111024"        % "container",
-  "ch.qos.logback"      % "logback-classic"               % "1.0.0"                  
+  "ch.qos.logback"      % "logback-classic"               % "1.0.9"
   )
+}
 
-
-(resourceManaged in (Compile, LessKeys.less)) <<= (sourceDirectory in Compile)(_ / "webapp" / "assets")
+(resourceManaged in (Compile, LessKeys.less)) <<= (sourceDirectory in Compile)(_ / "webapp" / "assets")
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
-libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.10"))
+libraryDependencies <+= sbtVersion(v => "com.github.siasia" %% "xsbt-web-plugin" % (v+"-0.2.11"))
 
 resolvers += "my" at "http://btd.github.com/maven2"
 
-addSbtPlugin("com.github.btd" % "sbt-less-plugin" % "0.0.1")
+addSbtPlugin("com.github.btd" % "sbt-less-plugin" % "0.0.1")
diff --git a/src/main/scala/code/model/RepositoryDoc.scala b/src/main/scala/code/model/RepositoryDoc.scala
@@ -54,7 +54,7 @@ import Helper._
 class RepositoryDoc private() extends MongoRecord[RepositoryDoc] with ObjectIdPk[RepositoryDoc] with Loggable {
 
   //имя папки репозитория not null unique primary key хеш наверно SHA-1
-  object fsName extends StringField(this, 50, DigestUtils.sha(id.get.toString).toString)
+  object fsName extends StringField(this, 50, DigestUtils.sha1(id.get.toString).toString)
 
   //имя репозитория для пользователя not null
   object name extends StringField(this, 50) {

diff --git a/src/main/scala/code/model/UserDoc.scala b/src/main/scala/code/model/UserDoc.scala
@@ -129,7 +129,7 @@ object UserDoc extends UserDoc with MongoMetaRecord[UserDoc] with Loggable {
 
   def logUserIn(who: UserDoc, postLogin: () => Nothing): Nothing = {
     if (destroySessionOnLogin) {
-      S.session.open_!.destroySessionAndContinueInNewSession(() => {
+      S.session.openOrThrowException("assume session is exists").destroySessionAndContinueInNewSession(() => {
         logUserIn(who)
         postLogin()
       })
@@ -227,4 +227,4 @@ object Sessions {
     }
     sessions -= user
   }
-}
+}