Changeset e78081f for apps/jetty


Ignore:
Timestamp:
Nov 16, 2017 2:15:18 AM (3 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e9ff0c2
Parents:
eb04971
Message:

Jetty 9.2.22
Remove patches for 9.2.21

Location:
apps/jetty
Files:
1 deleted
1 edited
19 moved

Legend:

Unmodified
Added
Removed
  • apps/jetty/build.xml

    reb04971 re78081f  
    1717    <!-- unused until we go to 9.3 -->
    1818    <property name="jetty.branch" value="stable-9" />
    19     <property name="jetty.ver" value="9.2.21.v20170120" />
     19    <property name="jetty.ver" value="9.2.22.v20170606" />
    2020    <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
    21     <property name="jetty.sha1" value="3dcd4f66cc3f72800a2ee53fecf7b3f9d3f23eb2" />
     21    <property name="jetty.sha1" value="7f0b10d69b214337622e3c0565f94417828ba13e" />
    2222    <property name="jetty.filename" value="${jetty.base}.zip" />
    2323    <!-- change jetty.ver to jetty.branch for 9.3 -->
     
    160160        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlet-${jetty.ver}.jar" tofile="jettylib/jetty-servlet.jar" />
    161161        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-servlets-${jetty.ver}.jar" tofile="jettylib/jetty-servlets.jar" />
    162       <!--
    163162        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
    164        -->
     163      <!-- comment out above line and uncomment below and the patches section further down if we need patches
    165164        <jar destfile="jettylib/jetty-util.jar"  manifest="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" filesetmanifest="mergewithoutmain" >
    166165            <zipfileset excludes="**/RolloverFileOutputStream*.class" src="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" />
    167166            <zipfileset src="build/jetty-util-patch.jar" />
    168167        </jar>
     168       -->
    169169        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-webapp-${jetty.ver}.jar" tofile="jettylib/jetty-webapp.jar" />
    170170        <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-xml-${jetty.ver}.jar" tofile="jettylib/jetty-xml.jar" />
     
    374374    </target>   
    375375
     376    <!-- empty, uncomment below if needed -->
     377    <target name="buildPatches" unless="${with-libjetty9-java}" />
     378<!--
    376379    <target name="buildPatches" depends="jarPatches" unless="${with-libjetty9-java}" />
    377380
     
    404407        </condition>
    405408    </target>   
     409-->
    406410
    407411    <target name="clean" >
Note: See TracChangeset for help on using the changeset viewer.