EASY-2179: update scalatra (#70)

DANS-KNAW · Apr 3, 2020 · cbde14c · cbde14c
1 parent a38a29e
commit cbde14c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/command/pom.xml b/command/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>nl.knaw.dans.shared</groupId>
         <artifactId>dans-scala-app-project</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <relativePath />
     </parent>
 

diff --git a/command/src/test/scala/nl.knaw.dans.easy.ingest.command/CommandLineOptionsSpec.scala b/command/src/test/scala/nl.knaw.dans.easy.ingest.command/CommandLineOptionsSpec.scala
@@ -20,9 +20,10 @@ import java.nio.file.Paths
 
 import nl.knaw.dans.easy.ingest.command.CustomMatchers._
 import org.apache.commons.configuration.PropertiesConfiguration
-import org.scalatest.{ FlatSpec, Matchers }
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
 
-class CommandLineOptionsSpec extends FlatSpec with Matchers {
+class CommandLineOptionsSpec extends AnyFlatSpec with Matchers {
   private val resourceDirString: String = Paths.get(getClass.getResource("/").toURI).toAbsolutePath.toString
 
   private val mockedConfiguration = new Configuration("version x.y.z", new PropertiesConfiguration() {

diff --git a/command/src/test/scala/nl.knaw.dans.easy.ingest.command/CustomMatchers.scala b/command/src/test/scala/nl.knaw.dans.easy.ingest.command/CustomMatchers.scala
@@ -15,14 +15,11 @@
  */
 package nl.knaw.dans.easy.ingest.command
 
-import java.io.{FileInputStream, File}
+import java.io.File
+import java.nio.charset.StandardCharsets
 
 import org.apache.commons.io.FileUtils._
-import org.apache.commons.io.IOUtils
-import org.scalatest.matchers.{MatchResult, Matcher}
-import org.scalatest.words.ResultOfATypeInvocation
-
-import scala.util.{Success, Failure, Try}
+import org.scalatest.matchers.{ MatchResult, Matcher }
 
 
 /** See also <a href="http://www.scalatest.org/user_guide/using_matchers#usingCustomMatchers">CustomMatchers</a> */
@@ -32,7 +29,7 @@ trait CustomMatchers {
     def apply(left: File): MatchResult = {
       def trimLines(s: String): String = s.split("\n").map(_.trim).mkString("\n")
       MatchResult(
-        trimLines(readFileToString(left)).contains(trimLines(content)),
+        trimLines(readFileToString(left, StandardCharsets.UTF_8)).contains(trimLines(content)),
         s"$left did not contain: $content" ,
         s"$left contains $content"
       )

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>nl.knaw.dans.shared</groupId>
         <artifactId>dans-scala-project</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <relativePath />
     </parent>