Changeset b374b11
- Timestamp:
- Apr 11, 2018 6:24:37 PM (3 years ago)
- Branches:
- master
- Children:
- 2f53f255
- Parents:
- 57e21e90
- Files:
-
- 7 added
- 7 deleted
- 4 edited
- 19 moved
Legend:
- Unmodified
- Added
- Removed
-
apps/jetty/apache-tomcat-8.5.30/NOTICE
r57e21e90 rb374b11 1 1 Apache Tomcat 2 Copyright 1999-201 7The Apache Software Foundation2 Copyright 1999-2018 The Apache Software Foundation 3 3 4 4 This product includes software developed at -
apps/jetty/build.xml
r57e21e90 rb374b11 18 18 <!-- jetty.branch unused until we go to 9.3 --> 19 19 <property name="jetty.branch" value="stable-9" /> 20 <property name="jetty.ver" value="9.2.2 2.v20170606" />20 <property name="jetty.ver" value="9.2.24.v20180105" /> 21 21 <property name="jetty.base" value="jetty-distribution-${jetty.ver}" /> 22 <property name="jetty.sha1" value=" 7f0b10d69b214337622e3c0565f94417828ba13e" />22 <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" /> 23 23 <property name="jetty.filename" value="${jetty.base}.zip" /> 24 24 <!-- change jetty.ver to jetty.branch for 9.3 --> … … 29 29 30 30 <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! --> 31 <property name="tomcat.ver" value="8.5. 23" />31 <property name="tomcat.ver" value="8.5.30" /> 32 32 <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package, 33 33 so we just use the full package instead. … … 303 303 <!-- Apache package version --> 304 304 <!-- we match what was bundled in the Jetty package version --> 305 <!-- except we need compat/ as of 8.5.29 or JspC fails in the jar scan --> 305 306 <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/jasper.jar"/> 306 307 <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-api.jar"/> 307 308 <zipfileset includes="org/apache/juli/logging/**/*" src="${tomcat.bin}/tomcat-juli.jar"/> 308 <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/ compat/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/>309 <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE org/apache/tomcat/util/codec/ org/apache/tomcat/util/threads/" src="${tomcat.lib}/tomcat-util.jar"/> 309 310 <zipfileset excludes="META-INF/LICENSE META-INF/NOTICE" src="${tomcat.lib}/tomcat-util-scan.jar"/> 310 311 </jar> -
build.xml
r57e21e90 rb374b11 1374 1374 1375 1375 <target name="preplicenses-unlesspkg" depends="settomcatprop" unless="${with-libtomcat-java}" > 1376 <copy file="apps/jetty/apache-tomcat-8.5. 23/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" />1376 <copy file="apps/jetty/apache-tomcat-8.5.30/NOTICE" tofile="pkg-temp/licenses/NOTICE-Tomcat.txt" /> 1377 1377 </target> 1378 1378 … … 2363 2363 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2364 2364 <!-- libjetty9-java --> 2365 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.2 2.v20170606" />2365 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" /> 2366 2366 <!-- libtomcat8-java --> 2367 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5. 23" />2367 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" /> 2368 2368 <!-- libjstl1.1-java or glassfish-javaee or libtaglibs-standard --> 2369 2369 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> … … 2440 2440 <!-- libjetty9-java --> 2441 2441 <!-- 2442 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.2 2.v20170606" />2443 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5. 23" />2442 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" /> 2443 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" /> 2444 2444 --> 2445 2445 <!-- libjstl1.1-java or glassfish-javaee --> … … 2519 2519 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2520 2520 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2521 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.2 2.v20170606" />2522 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5. 23" />2521 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" /> 2522 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" /> 2523 2523 <!-- 2524 2524 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> … … 2589 2589 <file name="../i2p-${Extended.Version}/installer/resources/geoip.txt" /> 2590 2590 <file name="../i2p-${Extended.Version}/installer/resources/geoipv6.dat.gz" /> 2591 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.2 2.v20170606" />2592 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5. 23" />2591 <fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-9.2.24.v20180105" /> 2592 <fileset dir="../i2p-${Extended.Version}/apps/jetty/apache-tomcat-8.5.30" /> 2593 2593 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" /> 2594 2594 <file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" /> -
history.txt
r57e21e90 rb374b11 1 2018-04-11 zzz 2 * Jetty 9.2.24-v201801015 3 * Tomcat 8.5.30 4 1 5 * 2018-04-10 0.9.34 released 2 6 -
router/java/src/net/i2p/router/RouterVersion.java
r57e21e90 rb374b11 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 0;21 public final static long BUILD = 1; 22 22 23 23 /** for example "-test" */
Note: See TracChangeset
for help on using the changeset viewer.