loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Jetty 9.2.24-v201801015, Tomcat 8.5.30

Browse Source
This commit is contained in:
zzz
2018-04-11 18:24:37 +00:00
parent 57e21e906f
commit b374b1136e
37 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.xml
View File

@@ -1373,7 +1373,7 @@
</target>
<target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
<copy file="apps/jetty/apache-tomcat-8.5.23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
<copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
</target>
<!-- DOES include launch4j licenses for Windows builds -->
@@ -2362,9 +2362,9 @@
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<!-- libjetty9-java -->
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
<!-- libtomcat8-java -->
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<!-- libjakarta-taglibs-standard-java or glassfish-javaee or libtaglibs-standard -->
@@ -2439,8 +2439,8 @@
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<!-- libjetty9-java -->
<!--
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
-->
<!-- libjstl1.1-java or glassfish-javaee -->
<!--
@@ -2518,8 +2518,8 @@
-->
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<!--
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
-->
@@ -2588,8 +2588,8 @@
-->
<file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" />
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.22.v20170606" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.23" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!-- anything added above, add in debian-tarball also -->