commit c30b25acbd32c5c6ff7c23c47062caf131d4a783 Author: Karsten Loesing karsten.loesing@gmx.net Date: Mon Sep 23 15:28:41 2019 +0200

Use ant tasks to fetch metrics dependencies.

Implements part of #31649. --- .gitlab-ci.yml | 11 ++--------- build.xml | 14 ++++++++++++++ src/build | 2 +- src/submods/metrics-lib | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d10fcb8..ba2f6c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" - EXONERATOR_VERSION: "4.1.0" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8"

stages: @@ -16,13 +14,8 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$ME... | tar xzf - - - curl https://dist.torproject.org/exonerator/$EXONERATOR_VERSION/exonerator-$EXONE... | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib - - mv tmp/exonerator-$EXONERATOR_VERSION/generated/dist/exonerator-$EXONERATOR_VERSION-thin.jar lib + - ant fetch-metrics-lib + - ant fetch-exonerator - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/build.xml b/build.xml index 3e8048f..959d069 100644 --- a/build.xml +++ b/build.xml @@ -308,6 +308,20 @@ </exec> </target>

+ <target name="fetch-exonerator" depends="init" + description="Fetch ExoneraTor from dist.torproject.org"> + <mkdir dir="${downloadedlibs}"/> + <get src="https://dist.torproject.org/exonerator/$%7Bexoneratorversion%7D/exonerator-$..." + dest="${downloadedlibs}"/> + <untar src="${downloadedlibs}/exonerator-${exoneratorversion}.tar.gz" + dest="${libs}" compression="gzip"> + <patternset> + <include name="**/exonerator-${exoneratorversion}-thin.jar"/> + </patternset> + <mapper type="flatten"/> + </untar> + </target> + <!-- The following line adds the common targets and properties for Metrics' Java Projects. --> diff --git a/src/build b/src/build index 0674958..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index c324d11..c1581dd 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit c324d11035059bd9677af120dc6471aebebf980a +Subproject commit c1581dd8ca26798dc90ea2189ca41636b50e1e0d