diff --git a/build.sbt b/build.sbt index 9faf95b91..af90c1fab 100644 --- a/build.sbt +++ b/build.sbt @@ -449,7 +449,8 @@ lazy val commandProj = (project in mainPath / "command"). settings( testedBaseSettings, name := "Command", - libraryDependencies ++= Seq(launcherInterface, templateResolverApi, giter8) + libraryDependencies ++= Seq(launcherInterface, templateResolverApi, giter8), + dependencyOverrides += plexusUtils ) // Fixes scope=Scope for Setting (core defined in collectionProj) to define the settings system used in build definitions @@ -488,6 +489,7 @@ lazy val mavenResolverPluginProj = (project in file("sbt-maven-resolver")). baseSettings, name := "sbt-maven-resolver", libraryDependencies ++= aetherLibs, + dependencyOverrides += plexusUtils, sbtPlugin := true ) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e3d3da933..ebac01e2d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { lazy val jline = "jline" % "jline" % "2.13" lazy val ivy = "org.scala-sbt.ivy" % "ivy" % "2.3.0-sbt-2cc8d2761242b072cedb0a04cb39435c4fa24f9a" - lazy val jsch = "com.jcraft" % "jsch" % "0.1.46" intransitive () + lazy val jsch = "com.jcraft" % "jsch" % "0.1.50" intransitive () lazy val sbinary = "org.scala-tools.sbinary" %% "sbinary" % "0.4.2" lazy val sbtSerialization = "org.scala-sbt" %% "serialization" % "0.1.2" lazy val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value } @@ -52,6 +52,7 @@ object Dependencies { val guice = "com.google.inject" % "guice" % "3.0" val guava = "com.google.guava" % "guava" % "18.0" val javaxInject = "javax.inject" % "javax.inject" % "1" + val plexusUtils = "org.codehaus.plexus" % "plexus-utils" % "3.0.18" //val sisuGuice = ("org.eclipse.sisu" % "sisu-guice" % "3.1.0").classifier("no_aop").exclude("javax.enterprise", "cdi-api", )