Update dependencies (#1170)

Author: marcospereira

build.sbt

@@ -12,28 +12,28 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
 // put jdeb on the classpath for scripted tests
 classpathTypes += "maven-plugin"
 libraryDependencies ++= Seq(
-  "org.apache.commons" % "commons-compress" % "1.14",
+  "org.apache.commons" % "commons-compress" % "1.18",
   // for jdkpackager
-  "org.apache.ant" % "ant" % "1.10.1",
-  "org.scalatest" %% "scalatest" % "3.0.3" % Test
+  "org.apache.ant" % "ant" % "1.10.5",
+  "org.scalatest" %% "scalatest" % "3.0.5" % Test
 )
 
 // sbt dependend libraries
 libraryDependencies ++= {
   (pluginCrossBuild / sbtVersion).value match {
     case v if v.startsWith("1.") =>
       Seq(
-        "org.scala-sbt" %% "io" % "1.0.0",
+        "org.scala-sbt" %% "io" % "1.2.2",
         // these dependencies have to be explicitly added by the user
         // FIXME temporary remove the 'provided' scope. SBT 1.0.0-M6 changed the resolving somehow
-        "com.spotify" % "docker-client" % "8.9.0" /* % "provided" */,
-        "org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
+        "com.spotify" % "docker-client" % "8.14.3" /* % "provided" */,
+        "org.vafer" % "jdeb" % "1.7" % Provided artifacts Artifact("jdeb", "jar", "jar")
       )
     case _ =>
       Seq(
         // these dependencies have to be explicitly added by the user
-        "com.spotify" % "docker-client" % "8.9.0" % Provided,
-        "org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
+        "com.spotify" % "docker-client" % "8.14.3" % Provided,
+        "org.vafer" % "jdeb" % "1.7" % Provided artifacts Artifact("jdeb", "jar", "jar")
       )
   }
 }
@@ -44,8 +44,8 @@ libraryDependencies ++= {
     case "2.10" => Nil
     case _ =>
       Seq(
-        "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6",
-        "org.scala-lang.modules" %% "scala-xml" % "1.0.6"
+        "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
+        "org.scala-lang.modules" %% "scala-xml" % "1.1.1"
       )
   }
 }

project/ChangelogPlugin.scala

@@ -90,6 +90,7 @@ object ChangelogPlugin extends AutoPlugin {
     val log = toProcessLogger(state)
     val base = vcs(state).baseDir
     val sign = Project.extract(state).get(releaseVcsSign)
+    val signOff = Project.extract(state).get(releaseVcsSignOff)
     val changelogFile = base / "CHANGELOG.md"
 
     val relativePath = IO
@@ -103,7 +104,7 @@ object ChangelogPlugin extends AutoPlugin {
     if (vcsAddOutput.isEmpty) {
       state.log.info("CHANGELOG.md hasn't been changed.")
     } else {
-      vcs(state).commit("Update changelog", sign) ! log
+      vcs(state).commit("Update changelog", sign, signOff) ! log
     }
 
     state

project/ReadmeReleasePlugin.scala

@@ -56,6 +56,7 @@ object ReadmeReleasePlugin extends AutoPlugin {
     val log = toProcessLogger(state)
     val base = vcs(state).baseDir
     val sign = Project.extract(state).get(releaseVcsSign)
+    val signOff = Project.extract(state).get(releaseVcsSignOff)
     val readmeFile = base / "README.md"
 
     val relativePath = IO
@@ -69,7 +70,7 @@ object ReadmeReleasePlugin extends AutoPlugin {
     if (vcsAddOutput.isEmpty) {
       state.log.info("README.md hasn't been changed.")
     } else {
-      vcs(state).commit("Update release version in readme", sign) ! log
+      vcs(state).commit("Update release version in readme", sign, signOff) ! log
     }
 
     state

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.0.0")
 addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")
 

src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala

@@ -11,7 +11,7 @@ import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
   linuxScriptReplacements,
   packageArchitecture
 }
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 import DebianPlugin.Names
 import DebianPlugin.autoImport._
 
@@ -149,8 +149,8 @@ private class JDebPackagingTask {
                     log: Logger): Unit = {
     val debMaker = new DebMaker(
       new JDebConsole(log),
-      fileAndDirectoryProducers(mappings, targetDir) ++ linkProducers(symlinks),
-      conffileProducers(mappings, targetDir)
+      (fileAndDirectoryProducers(mappings, targetDir) ++ linkProducers(symlinks)).asJava,
+      conffileProducers(mappings, targetDir).asJava
     )
     // set compression default to none - in line with native version / allows rsync to be effective
     debMaker setCompression "none"