Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Various bits of build file Gardening #1950

Merged
merged 16 commits into from
Jun 17, 2018
Merged

Various bits of build file Gardening #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
486ed42
Update API doc link
farmdawgnation Jun 3, 2018
0d79f9a
Bump Scala 2.12 release to 2.12.6
farmdawgnation Jun 3, 2018
d60e855
Commons-codec -> 1.11, commons-fileupload -> 1.3.3
farmdawgnation Jun 3, 2018
5daa8f4
Bump joda-time to 2.10
farmdawgnation Jun 3, 2018
24727e3
Bump joda-convert to 2.0.2
farmdawgnation Jun 3, 2018
d2f8044
Bump htmlparser to 1.4.11
farmdawgnation Jun 3, 2018
cd2a9ca
Bump mongodb drivers to 3.7.1
farmdawgnation Jun 3, 2018
f83501b
Bump scalaz-core to 7.2.24
farmdawgnation Jun 3, 2018
dabcb11
Bump slf4j version to 1.7.25
farmdawgnation Jun 3, 2018
df0070e
Bump scala-xml to 1.0.6
farmdawgnation Jun 3, 2018
8ccfb5f
Bump rhino to 1.7.10
farmdawgnation Jun 3, 2018
923f303
Bump parser combinators to 1.1.0
farmdawgnation Jun 3, 2018
5c25676
Group provided deps
farmdawgnation Jun 3, 2018
56c4a4e
Bump joda-convert to 2.1
farmdawgnation Jun 13, 2018
54c3fee
Revert htmlparser version bump
farmdawgnation Jun 16, 2018
c1e31ca
Return parser combinators to their previous version
farmdawgnation Jun 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
36 changes: 18 additions & 18 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this was a million years ago but any idea for the reason behind it?

No biggie -- I'm just currently in the flail-in-the-dark phase of bumping us to Lift 3.4.3 and am going error by eror 😅 .

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think most of this PR was just getting us up to date with regard to our outdated dependencies.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iiiiinterestingly enough:

we upgraded to lift 3.3 and our tests started failing. adding exclude("org.mozilla", "rhino"), to our lift dependencies got 'em to pass O___o.

not sure if we're just postponing the inevitable but i found it noteworthy.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's what got me asking about why this updated dependency -- we were only successful after we reverted it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible that you have other dependencies that rely on there being an older version of rhino present and Lift bringing in a newer version transitively causes issues for you. I'd recommend taking a look at what other dependencies might ask for Rhino (or look for any direct dependencies on it in your project) to try and determine whether or not that's what is happening. If you use Rhino directly, there's a good chance you'll have code to update.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is direct usage in that codebase fwiw 😉

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible that you have other dependencies that rely on there being an older version of rhino present and Lift bringing in a newer version transitively causes issues for you.

ooh yeah. I think that's why it the exclude worked, yah?

I suppose I expected something Rhino-y in this PR. That is, instead of just bumping a version, maybe something like rhino.oldFunction -> rhino.newFunction. On the other hand, version bumps to stay current -- with no code changes -- are also legit.

There is direct usage in that codebase fwiw 😉

'preciate it :D Suppose I might have to Actually Dig In:tm: & learn myself some Clojure 😎.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Caveat -- I say "Clojure" 'cause I think that's how we're using it. Prolly shoulda read the README first 😅 .

lazy val scala_parser = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
lazy val xerces = "xerces" % "xercesImpl" % "2.11.0"

Expand All @@ -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:
Expand All @@ -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"
}