From 2bb0248e445766695e7140687b9b1f771795e4ae Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Wed, 1 Feb 2012 19:30:55 +1100
Subject: [PATCH] Use jetty-jsp for jetty-distribution

---
 jetty-distribution/pom.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index c9a95670cb7..f89124398e6 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -125,7 +125,7 @@
             <configuration>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
               <excludeGroupIds>org.eclipse.jetty.orbit</excludeGroupIds>
-              <excludeArtifactIds>jetty-start,jetty-monitor</excludeArtifactIds>
+              <excludeArtifactIds>jetty-start,jetty-monitor,jetty-jsp</excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
             </configuration>
@@ -304,6 +304,17 @@
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.transaction</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>javax.security.auth.message</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-jsp</artifactId>
+      <version>${project.version}</version> 
+    </dependency>
+<!--
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.el</artifactId>
@@ -316,10 +327,6 @@
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet.jsp.jstl</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.security.auth.message</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>com.sun.el</artifactId>
@@ -336,7 +343,7 @@
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>org.eclipse.jdt.core</artifactId>
     </dependency>
-
+-->
     <!-- Standard Jetty Deps -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>