Permalink
Browse files

also add a name in the ivy xml exclude so it's included in the pom

  • Loading branch information...
1 parent 5993bee commit 919f51a1600800be29a94448011031221a339428 @casualjim casualjim committed Aug 8, 2012
Showing with 3 additions and 21 deletions.
  1. +3 −21 project/build.scala
View
24 project/build.scala
@@ -36,8 +36,8 @@ object ScalatraBuild extends Build {
LsKeys.skipWrite := true
),
aggregate = Seq(scalatraCore, scalatraAuth, scalatraFileupload,
- scalatraScalate, scalatraLiftJson, scalatraAntiXml, scalatraJerkson,
- scalatraTest, scalatraScalatest, scalatraSpecs, scalatraSpecs2, scalatraSlf4j,
+ scalatraScalate, scalatraLiftJson, scalatraSlf4j,
+ scalatraTest, scalatraScalatest, scalatraSpecs, scalatraSpecs2,
scalatraAkka, scalatraDocs, scalatraSwagger, scalatraJetty)
// scalatraExample, scalatraAkka, scalatraDocs, scalatraSwagger, scalatraJetty)
)
@@ -102,24 +102,6 @@ object ScalatraBuild extends Build {
)
) dependsOn(scalatraCore % "compile;test->test;provided->provided")
- lazy val scalatraJerkson = Project(
- id = "scalatra-jerkson",
- base = file("jerkson"),
- settings = scalatraSettings ++ Seq(
- libraryDependencies += jerkson,
- description := "Jackson/Jerkson JSON support for Scalatra"
- )
- ) dependsOn(scalatraCore % "compile;test->test;provided->provided")
-
- lazy val scalatraAntiXml = Project(
- id = "scalatra-anti-xml",
- base = file("anti-xml"),
- settings = scalatraSettings ++ Seq(
- libraryDependencies += antiXml,
- description := "Anti-XML support for Scalatra"
- )
- ) dependsOn(scalatraCore % "compile;test->test;provided->provided")
-
lazy val scalatraJetty = Project(
id = "scalatra-jetty",
base = file("jetty"),
@@ -367,7 +349,7 @@ object ScalatraBuild extends Build {
// statement.
lazy val jettyOrbitHack = Seq(
ivyXML := <dependencies>
- <exclude org="org.eclipse.jetty.orbit" />
+ <exclude org="org.eclipse.jetty.orbit" name="javax.servlet" />
</dependencies>
)
}

0 comments on commit 919f51a

Please sign in to comment.