Skip to content

Commit 4e79c4e

Browse files
committed
FIX #982 Add maven-plugin to classpathTypes when using the JDebPlugin
1 parent 362392a commit 4e79c4e

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

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

+10-6
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package com.typesafe.sbt.packager.debian
33
import com.typesafe.sbt.packager.archetypes.TemplateWriter
44
import com.typesafe.sbt.packager.universal.Archives
55
import sbt._
6-
import sbt.Keys.{normalizedName, packageBin, streams, target, version}
6+
import sbt.Keys.{classpathTypes, normalizedName, packageBin, streams, target, version}
77
import com.typesafe.sbt.packager.linux.{LinuxFileMetaData, LinuxPackageMapping, LinuxSymlink}
88
import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
9-
linuxPackageMappings,
10-
linuxPackageSymlinks,
11-
linuxScriptReplacements,
12-
packageArchitecture
9+
linuxPackageMappings,
10+
linuxPackageSymlinks,
11+
linuxScriptReplacements,
12+
packageArchitecture
1313
}
1414
import scala.collection.JavaConversions._
1515
import org.vafer.jdeb.{DataProducer, DebMaker}
@@ -67,6 +67,8 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
6767

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

7274
val controlScripts = debianMaintainerScripts.value
@@ -96,7 +98,9 @@ object JDebPackaging extends AutoPlugin with DebianPluginLike {
9698
debianFile
9799
},
98100
packageBin := (packageBin dependsOn debianControlFile).value,
99-
packageBin := (packageBin dependsOn debianConffilesFile).value
101+
packageBin := (packageBin dependsOn debianConffilesFile).value,
102+
// workaround for sbt-coursier
103+
classpathTypes += "maven-plugin"
100104
)
101105

102106
/**

0 commit comments

Comments
 (0)