Use Ivy for resolving external dependencies.task-31326

Includes a metrics-lib upgrade to 2.6.2 and an upgrade to the latest
metrics-base commit 256e619.

Implements part of #31326.

3 files changed, 29 insertions, 14 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d3fb72..9c8062b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# Changes in version 7.0-1.20.0 - 2019-0?-??
+
+ * Medium changes
+   - Use Ivy for resolving external dependencies rather than relying
+     on files found in Debian stable packages. Requires installing Ivy
+     (using `apt-get install ivy`, `brew install ivy`, or similar) and
+     running `ant resolve` (or `ant -lib /usr/share/java resolve`).
+     Retrieved files are then copied to the `lib/` directory, except
+     for dependencies on other metrics libraries that still need to be
+     copied to the `lib/` directory manually. Current dependency
+     versions resolved by Ivy are the same as in Debian stretch with
+     few exceptions.
+
+
 # Changes in version 7.0-1.19.1 - 2018-11-20
 
  * Minor changes
diff --git a/build.xml b/build.xml
index 1f6b69c..b0f30f8 100644
--- a/build.xml
+++ b/build.xml
@@ -4,14 +4,15 @@
        <!ENTITY base SYSTEM "src/build/java/base.xml">
 ]>
 
-<project default="usage" name="Onionoo" basedir=".">
+<project default="usage" name="Onionoo" basedir="."
+         xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <property name="javadoc-title" value="Onionoo API Documentation"/>
   <property name="implementation-title" value="Onionoo" />
   <property name="onionoo.protocol.version" value="7.0"/>
   <property name="release.version"
             value="${onionoo.protocol.version}-1.19.1-dev"/>
-  <property name="metricslibversion" value="2.4.0"/>
+  <property name="metricslibversion" value="2.6.2"/>
   <property name="jetty.version" value="-9.2.21.v20170120" />
   <property name="warfile"
             value="onionoo-${release.version}.war"/>
@@ -43,7 +44,7 @@
   </target>
 
   <patternset id="library" >
-    <include name="metrics-lib-${metricslibversion}.jar"/>
+    <include name="metrics-lib-${metricslibversion}-thin.jar"/>
     <include name="commons-codec-1.10.jar"/>
     <include name="commons-compress-1.13.jar"/>
     <include name="commons-lang3-3.5.jar"/>
@@ -57,17 +58,17 @@
   </patternset>
 
   <patternset id="web" >
-    <include name="servlet-api-3.1.jar"/>
-    <include name="jetty9-server${jetty.version}.jar"/>
-    <include name="jetty9-servlets${jetty.version}.jar"/>
-    <include name="jetty9-servlet${jetty.version}.jar"/>
-    <include name="jetty9-util${jetty.version}.jar"/>
-    <include name="jetty9-http${jetty.version}.jar"/>
-    <include name="jetty9-io${jetty.version}.jar"/>
-    <include name="jetty9-xml${jetty.version}.jar"/>
-    <include name="jetty9-webapp${jetty.version}.jar"/>
-    <include name="jetty9-continuation${jetty.version}.jar"/>
-    <include name="jetty9-security${jetty.version}.jar"/>
+    <include name="javax.servlet-api-3.1.0.jar"/>
+    <include name="jetty-server${jetty.version}.jar"/>
+    <include name="jetty-servlets${jetty.version}.jar"/>
+    <include name="jetty-servlet${jetty.version}.jar"/>
+    <include name="jetty-util${jetty.version}.jar"/>
+    <include name="jetty-http${jetty.version}.jar"/>
+    <include name="jetty-io${jetty.version}.jar"/>
+    <include name="jetty-xml${jetty.version}.jar"/>
+    <include name="jetty-webapp${jetty.version}.jar"/>
+    <include name="jetty-continuation${jetty.version}.jar"/>
+    <include name="jetty-security${jetty.version}.jar"/>
   </patternset>
 
   <patternset id="runtime" >
diff --git a/src/build b/src/build
-Subproject e639c697e9e94c6dbb26e946e5247c20a62c066
+Subproject 256e6192ad0066e48c6abb0ee9ac71714c7a3a0