Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-02-18 03:24:29 -0500
committerJan Bartel2015-02-18 03:25:20 -0500
commitd85662bd6e2a56bbbb8f753fede2036dfeba740f (patch)
treee82e3e7db1a4df299455c482934efd7e5c2d96e8
parentb78faff1bfeaa0a7470ad4223be637b89cc2af71 (diff)
downloadorg.eclipse.jetty.project-d85662bd6e2a56bbbb8f753fede2036dfeba740f.tar.gz
org.eclipse.jetty.project-d85662bd6e2a56bbbb8f753fede2036dfeba740f.tar.xz
org.eclipse.jetty.project-d85662bd6e2a56bbbb8f753fede2036dfeba740f.zip
459681 Remove Glassfish JSP in favor of Apache JSP
-rw-r--r--apache-jsp/src/main/config/modules/apache-jsp.mod (renamed from apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod)0
-rw-r--r--apache-jstl/src/main/config/modules/apache-jstl.mod (renamed from apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod)0
-rw-r--r--jetty-ant/pom.xml2
-rw-r--r--jetty-distribution/pom.xml55
-rw-r--r--jetty-distribution/src/main/resources/modules/jsp.mod14
-rw-r--r--jetty-distribution/src/main/resources/modules/jstl.mod8
-rw-r--r--jetty-jsp/pom.xml90
-rw-r--r--jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod8
-rw-r--r--jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod6
-rw-r--r--jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java107
-rw-r--r--jetty-jsp/src/main/resources/readme.txt4
-rw-r--r--jetty-osgi/jetty-osgi-boot-jsp/pom.xml21
-rw-r--r--jetty-osgi/test-jetty-osgi/pom.xml40
-rw-r--r--jetty-runner/pom.xml7
-rw-r--r--pom.xml72
-rw-r--r--tests/test-integration/pom.xml2
16 files changed, 47 insertions, 389 deletions
diff --git a/apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod b/apache-jsp/src/main/config/modules/apache-jsp.mod
index aed547c851..aed547c851 100644
--- a/apache-jsp/src/main/config/modules/jsp-impl/apache-jsp.mod
+++ b/apache-jsp/src/main/config/modules/apache-jsp.mod
diff --git a/apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod b/apache-jstl/src/main/config/modules/apache-jstl.mod
index 804b19131b..804b19131b 100644
--- a/apache-jstl/src/main/config/modules/jsp-impl/apache-jstl.mod
+++ b/apache-jstl/src/main/config/modules/apache-jstl.mod
diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml
index 64205ba7ad..fad1e91a9f 100644
--- a/jetty-ant/pom.xml
+++ b/jetty-ant/pom.xml
@@ -26,7 +26,7 @@
<configuration>
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts</excludeGroupIds>
- <excludeArtifactIds>jetty-all,jetty-start,jetty-monitor,jetty-jsp</excludeArtifactIds>
+ <excludeArtifactIds>jetty-all,jetty-start,jetty-monitor</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${project.build.directory}/test-lib</outputDirectory>
</configuration>
diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index d8fc9d3c37..e24f9b4153 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -302,7 +302,7 @@
<configuration>
<includeGroupIds>org.eclipse.jetty</includeGroupIds>
<excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.http2,org.eclipse.jetty.websocket,org.eclipse.jetty.fcgi,org.eclipse.jetty.toolchain,org.apache.taglibs</excludeGroupIds>
- <excludeArtifactIds>jetty-all,jetty-jsp,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring</excludeArtifactIds>
+ <excludeArtifactIds>jetty-all,apache-jsp,apache-jstl,jetty-start,jetty-monitor,jetty-spring</excludeArtifactIds>
<includeTypes>jar</includeTypes>
<outputDirectory>${assembly-directory}/lib</outputDirectory>
</configuration>
@@ -445,19 +445,6 @@
</configuration>
</execution>
<execution>
- <id>copy-glassfish-jsp-deps</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.eclipse.jetty.orbit,org.glassfish.web, org.glassfish, javax.el, javax.servlet.jsp, org.eclipse.jetty.toolchain, org.eclipse.jetty</includeGroupIds>
- <includeArtifactIds>org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, jetty-jsp-jdt, javax.el-api, javax.el, jetty-jsp</includeArtifactIds>
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>copy-apache-jsp-deps</id>
<phase>generate-resources</phase>
<goals>
@@ -486,19 +473,6 @@
</configuration>
</execution>
<execution>
- <id>copy-jstl-impl</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <includeGroupIds>org.glassfish.web</includeGroupIds>
- <includeArtifactIds>javax.servlet.jsp.jstl</includeArtifactIds>
- <includeTypes>jar</includeTypes>
- <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
- </configuration>
- </execution>
- <execution>
<id>copy-apache-jstl-deps</id>
<phase>generate-resources</phase>
<goals>
@@ -650,28 +624,6 @@
</dependency>
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-jsp-jdt</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
</dependency>
@@ -740,11 +692,6 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
<artifactId>apache-jsp</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/jetty-distribution/src/main/resources/modules/jsp.mod b/jetty-distribution/src/main/resources/modules/jsp.mod
index bb31ca7599..a16cc93dc9 100644
--- a/jetty-distribution/src/main/resources/modules/jsp.mod
+++ b/jetty-distribution/src/main/resources/modules/jsp.mod
@@ -5,17 +5,5 @@
[depend]
servlet
annotations
-jsp-impl/${jsp-impl}-jsp
+apache-jsp
-[ini-template]
-# JSP Configuration
-
-# Select JSP implementation, choices are
-# glassfish : The reference implementation
-# default in jetty <= 9.1
-# apache : The apache version
-# default jetty >= 9.2
-jsp-impl=apache
-
-# To use a non-jdk compiler for JSP compilation when using glassfish uncomment next line
-# -Dorg.apache.jasper.compiler.disablejsr199=true
diff --git a/jetty-distribution/src/main/resources/modules/jstl.mod b/jetty-distribution/src/main/resources/modules/jstl.mod
index 4694389b99..efc310af6e 100644
--- a/jetty-distribution/src/main/resources/modules/jstl.mod
+++ b/jetty-distribution/src/main/resources/modules/jstl.mod
@@ -4,11 +4,5 @@
[depend]
jsp
-jsp-impl/${jsp-impl}-jstl
+apache-jstl
-[ini-template]
-# JSTL Configuration
-# The glassfish jsp-impl includes JSTL by default and this module
-# is not required to activate it.
-# The apache jsp-impl does not include JSTL by default and this module
-# is required to put JSTL on the container classpath
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
deleted file mode 100644
index 8799f1e955..0000000000
--- a/jetty-jsp/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-project</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jetty-jsp</artifactId>
- <name>Jetty :: Glassfish JSP Implementation</name>
- <url>http://www.eclipse.org/jetty</url>
- <packaging>jar</packaging>
- <properties>
- <bundle-symbolic-name>${project.groupId}.glassfish.jsp.parent</bundle-symbolic-name>
- </properties>
- <build>
- <plugins>
- </plugins>
- </build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Schemas -->
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-schemas</artifactId>
- </dependency>
-
- <!-- servlet api -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
-
- <!-- JSP Api -->
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- </dependency>
- <!-- JSP Impl -->
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </dependency>
-
- <!-- JSTL Api -->
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- </dependency>
- <!-- JSTL Impl -->
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- </dependency>
-
- <!-- EL Api -->
- <!-- Not needed as glassfish impl jars contain also the api classes
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- </dependency>
- -->
-
- <!-- EL Impl -->
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- </dependency>
-
-
- <!-- Eclipse Java Compiler (for JSP Compilation) -->
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>org.eclipse.jdt.core</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod b/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod
deleted file mode 100644
index 130d2b371f..0000000000
--- a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jsp.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Glassfish JSP Module
-#
-[name]
-jsp-impl
-
-[lib]
-lib/jsp/*.jar
diff --git a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod b/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod
deleted file mode 100644
index 4b8e6f360c..0000000000
--- a/jetty-jsp/src/main/config/modules/jsp-impl/glassfish-jstl.mod
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Glassfish JSTL
-[name]
-jstl-impl
-
-# This file is empty as glassfish jstl is provided by glassfish jsp
diff --git a/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java b/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java
deleted file mode 100644
index 05a9d51733..0000000000
--- a/jetty-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java
+++ /dev/null
@@ -1,107 +0,0 @@
-//
-// ========================================================================
-// Copyright (c) 1995-2015 Mort Bay Consulting Pty. Ltd.
-// ------------------------------------------------------------------------
-// All rights reserved. This program and the accompanying materials
-// are made available under the terms of the Eclipse Public License v1.0
-// and Apache License v2.0 which accompanies this distribution.
-//
-// The Eclipse Public License is available at
-// http://www.eclipse.org/legal/epl-v10.html
-//
-// The Apache License v2.0 is available at
-// http://www.opensource.org/licenses/apache2.0.php
-//
-// You may elect to redistribute this code under either of these licenses.
-// ========================================================================
-//
-
-package org.eclipse.jetty.jsp;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.jasper.servlet.JspServlet;
-import org.eclipse.jetty.server.handler.ContextHandler;
-import org.eclipse.jetty.util.URIUtil;
-import org.eclipse.jetty.util.resource.Resource;
-
-
-/**
- * JettyJspServlet
- *
- * Wrapper for the jsp servlet that handles receiving requests mapped from
- * jsp-property-groups. Mappings could be wildcard urls like "/*", which would
- * include welcome files, but we need those to be handled by the DefaultServlet.
- */
-public class JettyJspServlet extends JspServlet
-{
-
- /**
- *
- */
- private static final long serialVersionUID = -5387857473125086791L;
-
- @Override
- public void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
- {
-
-
- HttpServletRequest request = null;
- if (req instanceof HttpServletRequest)
- request = (HttpServletRequest)req;
- else
- throw new ServletException("Request not HttpServletRequest");
-
- String servletPath=null;
- String pathInfo=null;
- if (request.getAttribute("javax.servlet.include.request_uri")!=null)
- {
- servletPath=(String)request.getAttribute("javax.servlet.include.servlet_path");
- pathInfo=(String)request.getAttribute("javax.servlet.include.path_info");
- if (servletPath==null)
- {
- servletPath=request.getServletPath();
- pathInfo=request.getPathInfo();
- }
- }
- else
- {
- servletPath = request.getServletPath();
- pathInfo = request.getPathInfo();
- }
-
- String pathInContext = URIUtil.addPaths(servletPath,pathInfo);
- String jspFile = getInitParameter("jspFile");
-
- //if the request is for a jsp file then fall through to the jsp servlet
- if (jspFile == null)
- {
- if (pathInContext.endsWith("/"))
- {
- //dispatch via forward to the default servlet
- getServletContext().getNamedDispatcher("default").forward(req, resp);
- return;
- }
- else
- {
- //check if it resolves to a directory
- Resource resource = ((ContextHandler.Context)getServletContext()).getContextHandler().getResource(pathInContext);
- if (resource!=null && resource.isDirectory())
- {
- //dispatch via forward to the default servlet
- getServletContext().getNamedDispatcher("default").forward(req, resp);
- return;
- }
- }
- }
-
- //fall through to the normal jsp servlet handling
- super.service(req, resp);
- }
-
-
-}
diff --git a/jetty-jsp/src/main/resources/readme.txt b/jetty-jsp/src/main/resources/readme.txt
deleted file mode 100644
index 39d448b46e..0000000000
--- a/jetty-jsp/src/main/resources/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This jar file is purely to work around a problem with the Maven Dependency plugin.
-Several modules in jetty use the Dependency plugin to copy or unpack the dependencies of other modules.
-However, the Dependency plugin is not capable of unpacking or copying a dependency of type 'pom', which
-this module is, as it consists purely of external dependencies needed to run jsp.
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
index 1f8609d259..7a13779501 100644
--- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -42,28 +42,7 @@
<artifactId>apache-jsp</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jasper</groupId>
- <artifactId>apache-el</artifactId>
- <version>8.0.9.M3</version>
- </dependency>
- </dependencies>
-<!--
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- </dependency>
</dependencies>
--->
<build>
<plugins>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index f056f29841..f9973464a0 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -164,12 +164,44 @@
</dependency>
<dependency>
- <groupId>org.mortbay.jasper</groupId>
- <artifactId>apache-el</artifactId>
- <version>8.0.9.M3</version>
- <scope>test</scope>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>javax.servlet.jsp.jstl</artifactId>
+ <version>1.2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet.jsp.jstl</artifactId>
+ <version>1.2.0.v201105211821</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet.jsp</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<!-- Jetty Deps -->
<dependency>
diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml
index a64b6ebf84..165a617b39 100644
--- a/jetty-runner/pom.xml
+++ b/jetty-runner/pom.xml
@@ -95,7 +95,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>apache-jstl</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 197d577573..193d3b4c00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -466,7 +466,6 @@
<module>jetty-websocket</module>
<module>jetty-servlets</module>
<module>jetty-util-ajax</module>
- <module>jetty-jsp</module>
<module>apache-jsp</module>
<module>apache-jstl</module>
<module>jetty-maven-plugin</module>
@@ -541,37 +540,6 @@
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>javax.servlet.jsp-api</artifactId>
- <version>2.3.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- <version>2.3.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty.toolchain</groupId>
- <artifactId>jetty-jsp-jdt</artifactId>
- <version>2.3.3</version>
- </dependency>
-
-
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>javax.el-api</artifactId>
- <version>3.0.0</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
- </dependency>
-
- <dependency>
<groupId>org.mortbay.jasper</groupId>
<artifactId>apache-jsp</artifactId>
<version>8.0.9.M3</version>
@@ -591,30 +559,6 @@
<!-- JSTL Impl -->
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- <version>1.2.2</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet.jsp.jstl</groupId>
- <artifactId>jstl-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.1</version>
@@ -622,22 +566,6 @@
<!-- JSTL API -->
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet.jsp.jstl</artifactId>
- <version>1.2.0.v201105211821</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet.jsp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.taglibs</groupId>
<artifactId>taglibs-standard-spec</artifactId>
<version>1.2.1</version>
diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml
index ada8906a1d..ba6bca2426 100644
--- a/tests/test-integration/pom.xml
+++ b/tests/test-integration/pom.xml
@@ -132,7 +132,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp</artifactId>
+ <artifactId>apache-jsp</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>

Back to the top