diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 11418fb95e83caa226d50e2b94370c59aa1d4e80..fe96cb8afc652f4d3d818f5f8113bb7c2b2f840c 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -3,12 +3,12 @@ <!-- unused until we go to 9.3 --> <property name="jetty.branch" value="stable-9" /> - <property name="jetty.ver" value="9.2.13.v20150730" /> + <property name="jetty.ver" value="9.2.20.v20161216" /> <property name="jetty.base" value="jetty-distribution-${jetty.ver}" /> - <property name="jetty.sha1" value="9368e431901c7102bb6a39172e905de30d360484" /> + <property name="jetty.sha1" value="1ea78a0d8a4ca500c8d99c89950544223008e471" /> <property name="jetty.filename" value="${jetty.base}.zip" /> <!-- change jetty.ver to jetty.branch for 9.3 --> - <property name="jetty.url" value="http://download.eclipse.org/jetty/${jetty.ver}/dist/${jetty.filename}" /> + <property name="jetty.url" value="http://central.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${jetty.ver}/${jetty.filename}" /> <property name="verified.filename" value="verified.txt" /> <property name="javac.compilerargs" value="" /> <property name="javac.version" value="1.6" /> @@ -143,6 +143,7 @@ </jar> <jar destfile="jettylib/javax.servlet.jar" duplicate="preserve" filesetmanifest="mergewithoutmain" > <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/servlet-api-3.1.jar" /> + <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-api-2.3.1.jar" /> <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jsp/javax.servlet.jsp-2.3.2.jar" /> </jar> <!-- @@ -191,9 +192,10 @@ tomcat-api.jar + tomcat-util.jar: Add to javax.servlet.jar (as of Tomcat 7 / Jetty 8) --> <target name="copyTomcatLib" > - <jar destfile="jettylib/jasper-runtime.jar" filesetmanifest="merge" > - <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar" /> - <zipfileset src="${tomcat2.lib.small}/tomcat-coyote-util.jar" /> + <jar destfile="jettylib/jasper-runtime.jar" > + <manifest> + <attribute name="Note" value="Intentionally empty" /> + </manifest> </jar> <jar destfile="jettylib/commons-el.jar" duplicate="preserve" filesetmanifest="merge" > <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper-el.jar" />