Changeset 7fb82da


Ignore:
Timestamp:
Feb 27, 2017 9:31:44 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
45abf65
Parents:
1a28a2a
Message:

Partially revert previous checkin, which was missing some DTDs.
Delete previously checked-in DTDs, and in the build,
copy all the DTDs out of jetty-schemas-3.1.jar to javax.servlet.jar.
Update to Jetty 9.2.21.

Location:
apps/jetty
Files:
10 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    r1a28a2a r7fb82da  
    1717    <!-- unused until we go to 9.3 -->
    1818    <property name="jetty.branch" value="stable-9" />
    19     <property name="jetty.ver" value="9.2.20.v20161216" />
     19    <property name="jetty.ver" value="9.2.21.v20170120" />
    2020    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    21     <property name="jetty.sha1" value="1ea78a0d8a4ca500c8d99c89950544223008e471" />
     21    <property name="jetty.sha1" value="3dcd4f66cc3f72800a2ee53fecf7b3f9d3f23eb2" />
    2222    <property name="jetty.filename" value="${jetty.base}.zip" />
    2323    <!-- change jetty.ver to jetty.branch for 9.3 -->
     
    175175            <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" />
    176176            <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" />
    177             <!-- These files are copied out of jetty-schemas-3.1.jar -->
    178177            <!-- In Debian packages they are found in /usr/share/java/tomcat8-servlet-api.jar in the libtomcat8-java package -->
    179             <fileset dir="resources" includes="javax/**/*" />
     178            <zipfileset excludes="about.html about_files about_files/* META-INF/ECLIPSEF.* META-INF/eclipse.inf plugin.properties" src="${jetty.base}/lib/jetty-schemas-3.1.jar" />
    180179        </jar>
    181180      <!--
Note: See TracChangeset for help on using the changeset viewer.