From 9ac31573b43a2fec29cf320c4581fbda70e51cc7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 1 Jul 2018 14:16:56 +0000
Subject: [PATCH] Build: Move Jetty/Tomcat version properties to top-level
 build.xml

---
 apps/jetty/build.xml | 14 +++++++++-----
 build.xml            | 21 ++++++++++++---------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml
index c95c3c43d..be33c27b6 100644
--- a/apps/jetty/build.xml
+++ b/apps/jetty/build.xml
@@ -13,11 +13,10 @@
          the source in the java/ directory.
      -->
 
-    <!-- Note: Please change all references in top-level build.xml if you update to a new Jetty! -->
-    <!--       Also change javadoc URL in top-level build.properties.                            -->
+    <!-- Note: Change version numbers in top-level build.xml if you update to a new Tomcat or Jetty! -->
+
     <!-- jetty.branch unused until we go to 9.3 -->
     <property name="jetty.branch" value="stable-9" />
-    <property name="jetty.ver" value="9.2.24.v20180105" />
     <property name="jetty.base" value="jetty-distribution-${jetty.ver}" />
     <property name="jetty.sha1" value="a8af3941385d43eece329b09ae4a261e0cb3579c" />
     <property name="jetty.filename" value="${jetty.base}.zip" />
@@ -27,8 +26,6 @@
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.7" />
 
-    <!-- Note: Please change all references in top-level build.xml if you update to a new Tomcat! -->
-    <property name="tomcat.ver" value="8.5.30" />
     <!-- everything we need is in the deployer package, except for tomcat-api.jar in the full package,
          so we just use the full package instead.
       <property name="tomcat.lib" value="apache-tomcat-${tomcat.ver}-deployer/lib" />
@@ -77,6 +74,13 @@
    -->
 
     <target name="fetchJettylib" unless="jetty.zip.available" >
+        <fail message="Error - jetty.ver property not set - you must run from top level build.xml" >
+            <condition>
+                <not>
+                    <isset property="jetty.ver" />
+                </not>
+            </condition>
+        </fail>
         <echo message="It seems that you don't have '${jetty.filename}' deployed." />
         <echo message="The build script can download this file for you automatically," />
         <echo message="or alternatively you can obtain it manually from:" />
diff --git a/build.xml b/build.xml
index f853121fe..9973d6fde 100644
--- a/build.xml
+++ b/build.xml
@@ -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" />