Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add maven-plugin to classpathTypes when using JDebPlugin #985

Merged
merged 1 commit into from
May 27, 2017
Merged

Add maven-plugin to classpathTypes when using JDebPlugin #985

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala
View file
Open in desktop
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