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

Build: Move Jetty/Tomcat version properties to top-level build.xml

Browse Source
This commit is contained in:
zzz
2018-07-01 14:16:56 +00:00
parent a895bcc91e
commit 9ac31573b4
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
build.xml
View File

@@ -7,6 +7,9 @@
-->
<property file="override.properties"/>
<property file="build.properties"/>
<!-- When changing, also change javadoc URL in build.properties, and checksum in apps/jetty/build.xml -->
<property name="jetty.ver" value="9.2.24.v20180105" />
<property name="tomcat.ver" value="8.5.30" />
<!-- You probably don't want to change anything from here down -->
<target name="help" depends="all" />
@@ -1406,7 +1409,7 @@
</target>
<target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" >
<copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
<copy file="apps/jetty/apache-tomcat-${tomcat.ver}/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />
</target>
<!-- DOES include launch4j licenses for Windows builds -->
@@ -2411,9 +2414,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.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
<!-- libtomcat8-java -->
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
<!-- 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 -->
@@ -2493,8 +2496,8 @@
<file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" />
<!-- libjetty9-java -->
<!--
<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" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
-->
<!-- libjstl1.1-java or glassfish-javaee -->
<!--
@@ -2573,8 +2576,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.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
<!--
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
-->
@@ -2646,8 +2649,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.24.v20180105" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-${jetty.ver}" />
<fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-${tomcat.ver}" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<fileset dir="../i2p-${Extended.Version}/installer/resources/icons/flags" />