Skip to content

Commit

Permalink
FIX #982 Add maven-plugin to classpathTypes when using the JDebPlugin
Browse files Browse the repository at this point in the history
  • Loading branch information
muuki88 committed May 27, 2017
1 parent 362392a commit 2e5b9ec
Showing 1 changed file with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package com.typesafe.sbt.packager.debian
import com.typesafe.sbt.packager.archetypes.TemplateWriter
import com.typesafe.sbt.packager.universal.Archives
import sbt._
import sbt.Keys.{normalizedName, packageBin, streams, target, version}
import sbt.Keys.{classpathTypes, normalizedName, packageBin, streams, target, version}
import com.typesafe.sbt.packager.linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
linuxPackageMappings,
linuxPackageSymlinks,
linuxScriptReplacements,
packageArchitecture
linuxPackageMappings,
linuxPackageSymlinks,
linuxScriptReplacements,
packageArchitecture
}
import scala.collection.JavaConversions._
import org.vafer.jdeb.{DataProducer, DebMaker}
Expand Down Expand Up @@ -67,6 +67,8 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {

// unused, but needed as dependency
val controlDir = targetDir / Names.DebianMaintainerScripts
val _ = debianControlFile.value
val conffile = debianConffilesFile.value
val replacements = debianMakeChownReplacements.value +: linuxScriptReplacements.value

val controlScripts = debianMaintainerScripts.value
Expand Down Expand Up @@ -96,7 +98,9 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
debianFile
},
packageBin := (packageBin dependsOn debianControlFile).value,
packageBin := (packageBin dependsOn debianConffilesFile).value
packageBin := (packageBin dependsOn debianConffilesFile).value,
// workaround for sbt-coursier
classpathTypes += "maven-plugin"
)

/**
Expand Down

0 comments on commit 2e5b9ec

Please sign in to comment.