459734 Update to apache jsp 8.0.20

jetty · Mar 19, 2015 · 7c53dfe · 7c53dfe
1 parent ad4854d
commit 7c53dfe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml
@@ -104,20 +104,20 @@
  javax.servlet.jsp.jstl.fmt;version="1.2";resolution:=optional,
  javax.servlet.jsp.jstl.sql;version="1.2";resolution:=optional,
  javax.servlet.jsp.jstl.tlv;version="1.2";resolution:=optional,
- org.apache.el;version="[8.0.9,9)";resolution:=optional,
- org.apache.el.lang;version="[8.0.9,9)";resolution:=optional,
- org.apache.el.stream;version="[8.0.9,9)";resolution:=optional,
- org.apache.el.util;version="[8.0.9,9)";resolution:=optional,
- org.apache.el.parser;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.compiler;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.compiler.tagplugin;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.runtime;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.security;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.servlet;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.tagplugins.jstl;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.util;version="[8.0.9,9)";resolution:=optional,
- org.apache.jasper.xmlparser;version="[8.0.9,9)";resolution:=optional,
+ org.apache.el;version="[8.0.20,9)";resolution:=optional,
+ org.apache.el.lang;version="[8.0.20,9)";resolution:=optional,
+ org.apache.el.stream;version="[8.0.20,9)";resolution:=optional,
+ org.apache.el.util;version="[8.0.209,9)";resolution:=optional,
+ org.apache.el.parser;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.compiler;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.compiler.tagplugin;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.runtime;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.security;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.servlet;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.tagplugins.jstl;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.util;version="[8.0.20,9)";resolution:=optional,
+ org.apache.jasper.xmlparser;version="[8.0.20,9)";resolution:=optional,
  org.apache.taglibs.standard;version="1.2";resolution:=optional,
  org.apache.taglibs.standard.extra.spath;version="1.2";resolution:=optional,
  org.apache.taglibs.standard.functions;version="1.2";resolution:=optional,
@@ -141,8 +141,8 @@
  org.apache.taglibs.standard.tag.rt.xml;version="1.2";resolution:=optional,
  org.apache.taglibs.standard.tei;version="1.2";resolution:=optional,
  org.apache.taglibs.standard.tlv;version="1.2";resolution:=optional,
- org.apache.tomcat;version="[8.0.9,9)";resolution:=optional,
- org.eclipse.jetty.jsp;version="[9.2,10)";resolution:=optional,
+ org.apache.tomcat;version="[8.0.20,9)";resolution:=optional,
+ org.eclipse.jetty.jsp;version="[9.3,10)";resolution:=optional,
  org.osgi.*,
  org.xml.*;resolution:=optional,
  org.xml.sax.*;resolution:=optional,
@@ -152,7 +152,7 @@
  javax.xml.parser;resolution:=optional
  </Import-Package>
                <_nouses>true</_nouses>
-               <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="9.2.6",org.apache.jasper.*;version="8.0.9",org.apache.el.*;version="8.0.9"</DynamicImport-Package>
+               <DynamicImport-Package>org.eclipse.jetty.jsp.*;version="9.3",org.apache.jasper.*;version="8.0.20",org.apache.el.*;version="8.0.20"</DynamicImport-Package>
               </instructions>
           </configuration>
       </plugin>

diff --git a/pom.xml b/pom.xml
@@ -542,7 +542,7 @@
       <dependency>
         <groupId>org.mortbay.jasper</groupId>
         <artifactId>apache-jsp</artifactId>
-        <version>8.0.9.M3</version>
+        <version>8.0.20.M0</version>
       </dependency>
 
       <dependency>