diff options
| author | Karsten Loesing <karsten.loesing@gmx.net> | 2019-08-06 17:04:41 +0200 |
|---|---|---|
| committer | Karsten Loesing <karsten.loesing@gmx.net> | 2019-08-06 17:04:41 +0200 |
| commit | 027a54bfe2c970a72db2afc485d2fa12f77cb247 (patch) | |
| tree | 6b6c0cd0e73cf9d936cbf6dad2042844dfab5cf9 | |
| parent | abde3f7591117060ccf1afc9b26531d79619301f (diff) | |
Use Ivy for resolving external dependencies.task-31326
Includes an upgrade to the latest metrics-base commit 256e619.
Implements part of #31326.
| -rw-r--r-- | CHANGELOG.md | 9 | ||||
| -rw-r--r-- | build.xml | 3 | ||||
| m--------- | src/build | 0 |
3 files changed, 11 insertions, 1 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 @@ -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 -Subproject ed4819215aa60cc8935f955d9404f30e83dd892 +Subproject 256e6192ad0066e48c6abb0ee9ac71714c7a3a0 |