EASY-1945: upgrade dependencies #142
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # pom.xml
rvanheest
reviewed
Mar 13, 2020
| @@ -26,6 +26,6 @@ class EasySword2Servlet(version: String) extends ScalatraServlet | |||
|
|
|||
| get("/") { | |||
| contentType = "text/plain" | |||
| Ok(s"EASY SWORD2 is running v$version.").logResponse | |||
| logResponse(Ok(s"EASY SWORD2 is running v$version.")) | |||
There was a problem hiding this comment.
I think the response is logged twice now (after the upgrade of dans-scala-lib). Could you test if removing this whole logResponse still logs the response?
Suggested change
| logResponse(Ok(s"EASY SWORD2 is running v$version.")) | |
| Ok(s"EASY SWORD2 is running v$version.") |
|
please fix the merge conflict |
rvanheest
approved these changes
Mar 19, 2020
|
Note to self: before releasing this module, bump the |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes EASY-1945
When applied it will
lines.toListtolinesIterator.toListdue to consider rename StringOps#lines. conflict jdk11 java.lang.String#lines scala/bug#11125Where should the reviewer @DANS-KNAW/easy start?
How should this be manually tested?
related pull requests on github