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

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:" />