[tor-commits] [collector/master] Use Ivy for resolving external dependencies.

[karsten at torproject.org]

commit 027a54bfe2c970a72db2afc485d2fa12f77cb247
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Aug 6 17:04:41 2019 +0200

    Use Ivy for resolving external dependencies.
    
    Includes an upgrade to the latest metrics-base commit 256e619.
    
    Implements part of #31326.
---
 CHANGELOG.md | 9 +++++++++
 build.xml    | 3 ++-
 src/build    | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 613ef71..66e53ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@
  * Medium changes
    - Changed local import of bandwidth files to include the parent
      directory name as @source annotation and to the filename.
+   - 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 1.9.1 - 2019-05-29
diff --git a/build.xml b/build.xml
index d0fd248..39180c7 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,8 @@
        <!ENTITY base SYSTEM "src/build/java/base.xml">
 ]>
 
-<project default="usage" name="collector" basedir=".">
+<project default="usage" name="collector" basedir="."
+         xmlns:ivy="antlib:org.apache.ivy.ant">
 
   <property name="javadoc-title" value="CollecTor API Documentation"/>
   <property name="implementation-title" value="CollecTor" />
diff --git a/src/build b/src/build
index ed48192..256e619 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b
+Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f