Skip to content

Commit

Permalink
Fix #189: re-add unmanaged dependencies in WAR
Browse files Browse the repository at this point in the history
  • Loading branch information
dlecan committed Sep 26, 2013
1 parent d6fdf46 commit cbc0096
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions project-code/plugin/src/main/scala/Play2WarCommands.scala
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ trait Play2WarCommands extends sbt.PlayCommands with sbt.PlayReloader with sbt.P
})
}

val warTask = (playPackageEverything, dependencyClasspath in Runtime, target, normalizedName,
val warTask = (playPackageEverything, dependencyClasspath in Runtime, unmanagedClasspath in Runtime, target, normalizedName,
version, webappResource, streams, servletVersion, targetName, disableWarningWhenWebxmlFileFound, defaultFilteredArtifacts, filteredArtifacts, explodedJar) map {
(packaged, dependencies, target, id, version, webappResource, s, servletVersion, targetName, disableWarningWhenWebxmlFileFound, defaultFilteredArtifacts, filteredArtifacts, explodedJar) =>
(packaged, dependencies, unmanagedDependencies, target, id, version, webappResource, s, servletVersion, targetName, disableWarningWhenWebxmlFileFound, defaultFilteredArtifacts, filteredArtifacts, explodedJar) =>

s.log.info("Build WAR package for servlet container: " + servletVersion)

Expand Down Expand Up @@ -93,6 +93,9 @@ trait Play2WarCommands extends sbt.PlayCommands with sbt.PlayReloader with sbt.P
val path = ("WEB-INF/lib/" + fName)
Some(dependency.data -> path)
}.getOrElse(None)
} ++ unmanagedDependencies.map { unmanaged =>
val path = "WEB-INF/lib/" + unmanaged.data.getName
unmanaged.data -> path
} ++ {
if (explodedJar) {
s.log.info("Main artifacts " + packaged.map(_.getName).mkString("'", " ", "'") + " will be packaged exploded")
Expand Down

0 comments on commit cbc0096

Please sign in to comment.