Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaning up jetty-jsp dependencies to only arrive via jetty-jsp

This commit is contained in:
Joakim Erdfelt 2012-02-01 08:59:00 -07:00
parent 878d717b92
commit 228ff32ab0
6 changed files with 51 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jetty-distribution/pom.xml
View File

@ -314,36 +314,7 @@
<artifactId>jetty-jsp</artifactId> <artifactId>jetty-jsp</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<!--
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.el</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.jasper.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</dependency>
-->
<!-- Standard Jetty Deps --> <!-- Standard Jetty Deps -->
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

55
jetty-jsp/pom.xml
View File

@ -11,41 +11,48 @@
<build> <build>
</build> </build>
<dependencies> <dependencies>
<!-- jstl --> <!-- JSP Api -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
<version>1.2.0.v201105211821</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
<version>1.2.0.v201112081803</version>
</dependency>
<!-- el -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.el</artifactId> <artifactId>javax.servlet.jsp</artifactId>
<version>2.1.0.v201105211819</version> <version>2.1.0.v201105211820</version>
</dependency> </dependency>
<dependency> <!-- JSP Impl -->
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId>
<version>1.0.0.v201105211818</version>
</dependency>
<!-- jsp -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.jasper.glassfish</artifactId> <artifactId>org.apache.jasper.glassfish</artifactId>
<version>2.1.0.v201110031002</version> <version>2.1.0.v201110031002</version>
</dependency> </dependency>
<!-- ecj --> <!-- JSTL Api -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
<version>1.2.0.v201105211821</version>
</dependency>
<!-- JSTL Impl -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
<version>1.2.0.v201112081803</version>
</dependency>
<!-- EL Api -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.el</artifactId>
<version>2.1.0.v201105211819</version>
</dependency>
<!-- EL Impl -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId>
<version>1.0.0.v201105211818</version>
</dependency>
<!-- Eclipse Java Compiler (for JSP Compilation) -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId> <artifactId>org.eclipse.jdt.core</artifactId>
<version>3.7.1</version> <version>3.7.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

33
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
View File

@ -36,34 +36,11 @@
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId> <artifactId>javax.servlet</artifactId>
</dependency> </dependency>
<!-- Orbit JSP Deps --> <!-- Orbit JSP Deps -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax.el</artifactId> <artifactId>jetty-jsp</artifactId>
</dependency> <version>${project.version}</version>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.jasper.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
@ -117,6 +94,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

30
jetty-osgi/test-jetty-osgi/pom.xml
View File

@ -20,34 +20,12 @@
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet</artifactId> <artifactId>javax.servlet</artifactId>
</dependency> </dependency>
<!-- Orbit JSP Deps --> <!-- Orbit JSP Deps -->
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>javax.el</artifactId> <artifactId>jetty-jsp</artifactId>
</dependency> <version>${project.version}</version>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp.jstl</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>com.sun.el</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.jasper.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>org.eclipse.jdt.core</artifactId>
</dependency> </dependency>
<!-- OSGi Deps --> <!-- OSGi Deps -->

12
pom.xml
View File

@ -146,7 +146,7 @@
<!-- Banned Dependencies (should use Orbit based versions now) --> <!-- Banned Dependencies (should use Orbit based versions now) -->
<bannedDependencies> <bannedDependencies>
<includes> <includes>
<include>javax.servlet:servlet-api</include> <include>javax.servlet</include>
<include>org.apache.geronimo.specs</include> <include>org.apache.geronimo.specs</include>
<include>javax.mail</include> <include>javax.mail</include>
<include>javax.activation</include> <include>javax.activation</include>
@ -413,9 +413,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.el</artifactId> <artifactId>javax.security.auth.message</artifactId>
<version>2.1.0.v201105211819</version> <version>1.0.0.v201108011116</version>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.servlet.jsp</artifactId> <artifactId>javax.servlet.jsp</artifactId>
@ -428,8 +429,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>javax.el</artifactId>
<version>1.0.0.v201108011116</version> <version>2.1.0.v201105211819</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>org.eclipse.jetty.orbit</groupId>
@ -451,6 +452,7 @@
<artifactId>org.eclipse.jdt.core</artifactId> <artifactId>org.eclipse.jdt.core</artifactId>
<version>3.7.1</version> <version>3.7.1</version>
</dependency> </dependency>
-->
<!-- Old Deps --> <!-- Old Deps -->
<dependency> <dependency>

6
test-jetty-webapp/pom.xml
View File

@ -42,9 +42,9 @@
<descriptors> <descriptors>
<descriptor>src/main/assembly/web-bundle.xml</descriptor> <descriptor>src/main/assembly/web-bundle.xml</descriptor>
</descriptors> </descriptors>
<archive> <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive> </archive>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>