diff --git a/README.md b/README.md index dbcda11381..9106a3fb2b 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ The Lift wiki is hosted on Assembla and can be found at [http://www.assembla.com ### ScalaDocs -The ScalaDocs for each release of Lift, in additional to the actual JARs, are available on the Liftweb.net site. You can access the source code–based documentation for releases via the site's homepage or by navigating directly to the URL for the specific release. For instance, the Lift 3.0 release can be accessed at [http://liftweb.net/api/31/api/](http://liftweb.net/api/31/api/). +The ScalaDocs for each release of Lift, in additional to the actual JARs, are available on the Liftweb.net site. You can access the source code–based documentation for releases via the site's homepage or by navigating directly to the URL for the specific release. For instance, the Lift 3.2 release can be accessed at [http://liftweb.net/api/32/api/](http://liftweb.net/api/32/api/). ## License diff --git a/build.sbt b/build.sbt index 27e6cf985c..22a26be1bd 100644 --- a/build.sbt +++ b/build.sbt @@ -7,8 +7,8 @@ homepage in ThisBuild := Some(url("http://www.liftweb.net")) licenses in ThisBuild += ("Apache License, Version 2.0", url("http://www.apache.org/licenses/LICENSE-2.0.txt")) startYear in ThisBuild := Some(2006) organizationName in ThisBuild := "WorldWide Conferencing, LLC" -scalaVersion in ThisBuild := "2.12.4" -crossScalaVersions in ThisBuild := Seq("2.12.4", "2.11.11") +scalaVersion in ThisBuild := "2.12.6" +crossScalaVersions in ThisBuild := Seq("2.12.6", "2.11.11") libraryDependencies in ThisBuild ++= Seq(specs2, specs2Matchers, specs2Mock, scalacheck, scalatest) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 33470a68fc..c6d5e99bad 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -25,29 +25,29 @@ object Dependencies { lazy val CVMappingAll = crossMapped("2.11.7" -> "2.11") - lazy val slf4jVersion = "1.7.2" + lazy val slf4jVersion = "1.7.25" // Compile scope: // Scope available in all classpath, transitive by default. - lazy val commons_codec = "commons-codec" % "commons-codec" % "1.10" - lazy val commons_fileupload = "commons-fileupload" % "commons-fileupload" % "1.3.1" + lazy val commons_codec = "commons-codec" % "commons-codec" % "1.11" + lazy val commons_fileupload = "commons-fileupload" % "commons-fileupload" % "1.3.3" lazy val commons_httpclient = "commons-httpclient" % "commons-httpclient" % "3.1" lazy val javamail = "javax.mail" % "mail" % "1.4.7" lazy val jbcrypt = "org.mindrot" % "jbcrypt" % "0.4" - lazy val joda_time = "joda-time" % "joda-time" % "2.9.2" - lazy val joda_convert = "org.joda" % "joda-convert" % "1.8.1" + lazy val joda_time = "joda-time" % "joda-time" % "2.10" + lazy val joda_convert = "org.joda" % "joda-convert" % "2.1" lazy val htmlparser = "nu.validator.htmlparser" % "htmlparser" % "1.4" - lazy val mongo_java_driver = "org.mongodb" % "mongodb-driver" % "3.6.3" - lazy val mongo_java_driver_async = "org.mongodb" % "mongodb-driver-async" % "3.6.3" + lazy val mongo_java_driver = "org.mongodb" % "mongodb-driver" % "3.7.1" + lazy val mongo_java_driver_async = "org.mongodb" % "mongodb-driver-async" % "3.7.1" lazy val paranamer = "com.thoughtworks.paranamer" % "paranamer" % "2.8" lazy val scalajpa = "org.scala-libs" % "scalajpa" % "1.5" cross CVMappingAll lazy val scalap: ModuleMap = "org.scala-lang" % "scalap" % _ lazy val scala_compiler: ModuleMap = "org.scala-lang" % "scala-compiler" % _ - lazy val scalaz7_core = "org.scalaz" % "scalaz-core" % "7.2.7" cross CVMappingAll + lazy val scalaz7_core = "org.scalaz" % "scalaz-core" % "7.2.24" cross CVMappingAll lazy val squeryl = "org.squeryl" % "squeryl" % "0.9.5-7" cross CVMappingAll lazy val slf4j_api = "org.slf4j" % "slf4j-api" % slf4jVersion - lazy val scala_xml = "org.scala-lang.modules" %% "scala-xml" % "1.0.5" - lazy val rhino = "org.mozilla" % "rhino" % "1.7.7.1" + lazy val scala_xml = "org.scala-lang.modules" %% "scala-xml" % "1.0.6" + lazy val rhino = "org.mozilla" % "rhino" % "1.7.10" lazy val scala_parser = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" lazy val xerces = "xerces" % "xercesImpl" % "2.11.0" @@ -58,11 +58,15 @@ object Dependencies { // Provided scope: // Scope provided by container, available only in compile and test classpath, non-transitive by default. - lazy val logback = "ch.qos.logback" % "logback-classic" % "1.2.3" % "provided" - lazy val log4j = "log4j" % "log4j" % "1.2.17" % "provided" - lazy val slf4j_log4j12 = "org.slf4j" % "slf4j-log4j12" % slf4jVersion % "provided" - lazy val persistence_api = "javax.persistence" % "persistence-api" % "1.0.2" % "provided" + lazy val logback = "ch.qos.logback" % "logback-classic" % "1.2.3" % "provided" + lazy val log4j = "log4j" % "log4j" % "1.2.17" % "provided" + lazy val slf4j_log4j12 = "org.slf4j" % "slf4j-log4j12" % slf4jVersion % "provided" + lazy val persistence_api = "javax.persistence" % "persistence-api" % "1.0.2" % "provided" lazy val servlet_api = "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided" + lazy val jquery = "org.webjars.bower" % "jquery" % "1.11.3" % "provided" + lazy val jasmineCore = "org.webjars.bower" % "jasmine-core" % "2.4.1" % "provided" + lazy val jasmineAjax = "org.webjars.bower" % "jasmine-ajax" % "3.2.0" % "provided" + // Runtime scope: @@ -87,8 +91,4 @@ object Dependencies { lazy val specs2Mock = "org.specs2" %% "specs2-mock" % "3.8.6" % "test" lazy val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" % "test" lazy val junit = "junit" % "junit" % "4.8.2" % "test" - - lazy val jquery = "org.webjars.bower" % "jquery" % "1.11.3" % "provided" - lazy val jasmineCore = "org.webjars.bower" % "jasmine-core" % "2.4.1" % "provided" - lazy val jasmineAjax = "org.webjars.bower" % "jasmine-ajax" % "3.2.0" % "provided" }