Use jetty-jsp for jetty-distribution

This commit is contained in:
Jan Bartel 2012-02-01 19:30:55 +11:00
parent b7b56bc0f2
commit 2bb0248e44
1 changed files with 13 additions and 6 deletions

View File

@ -125,7 +125,7 @@
<configuration> <configuration>
<includeGroupIds>org.eclipse.jetty</includeGroupIds> <includeGroupIds>org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.orbit</excludeGroupIds> <excludeGroupIds>org.eclipse.jetty.orbit</excludeGroupIds>
<excludeArtifactIds>jetty-start,jetty-monitor</excludeArtifactIds> <excludeArtifactIds>jetty-start,jetty-monitor,jetty-jsp</excludeArtifactIds>
<includeTypes>jar</includeTypes> <includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory> <outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration> </configuration>
@ -304,6 +304,17 @@
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.transaction</artifactId> <artifactId>javax.transaction</artifactId>
</dependency> </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> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.el</artifactId> <artifactId>javax.el</artifactId>
@ -316,10 +327,6 @@
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId> <artifactId>javax.servlet.jsp.jstl</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.security.auth.message</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId> <artifactId>com.sun.el</artifactId>
@ -336,7 +343,7 @@
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId> <artifactId>org.eclipse.jdt.core</artifactId>
</dependency> </dependency>
-->
<!-- Standard Jetty Deps --> <!-- Standard Jetty Deps -->
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>