[tor-commits] [metrics-lib/master] Revert all Debian buster library upgrades.

[karsten@xxxxxxxxxxxxxx]

commit 7032e73a6471f3a4d7782ef65fc3d4cf00bb0ac1
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Sun Jul 28 21:46:09 2019 +0200

    Revert all Debian buster library upgrades.
    
    Turns out that updating all dependencies, including those in
    metrics-web and exonerator using servlets and JSPs, is much harder
    than expected. We decided to revert all these changes for now, so that
    we can merge patches again. We're going to investigate alternatives
    like Ant + Ivy, Maven, or Gradle in the near future.
---
 CHANGELOG.md | 20 --------------------
 build.xml    | 14 +++++++-------
 src/build    |  2 +-
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3622e1..18d250e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,3 @@
-# Changes in version 2.7.0 - 2019-0?-??
-
- * Medium changes
-   * Update build-time and run-time dependencies to versions found in
-     Debian buster, including: commons-codec-1.11.jar,
-     commons-compress-1.18.jar, jackson-annotations-2.9.8.jar,
-     jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar,
-     logback-core-1.2.3.jar, logback-classic-1.2.3.jar,
-     slf4j-api-1.7.25.jar, and xz-1.8.jar.
-   * Update Checkstyle dependencies to versions found in Debian
-     buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar,
-     checkstyle-8.15.jar, commons-beanutils-1.9.3.jar,
-     commons-collections3-3.2.2.jar, commons-logging-1.2.jar,
-     guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar.
-   * Update Cobertura dependencies to versions found in Debian buster,
-     including: asm4-5.0.4.jar, asm4-util-5.0.4.jar,
-     asm4-tree-5.0.4.jar, asm4-commons-5.0.4.jar,
-     asm4-analysis-5.0.4.jar, and commons-lang3-3.8.jar
-
-
 # Changes in version 2.6.2 - 2019-05-29
 
  * Medium changes
diff --git a/build.xml b/build.xml
index a163dc9..3066e90 100644
--- a/build.xml
+++ b/build.xml
@@ -14,13 +14,13 @@
   <property name="jarpatternprop" value="empty" />
 
   <patternset id="runtime" >
-      <include name="commons-codec-1.11.jar"/>
-      <include name="commons-compress-1.18.jar"/>
-      <include name="jackson-annotations-2.9.8.jar"/>
-      <include name="jackson-core-2.9.8.jar"/>
-      <include name="jackson-databind-2.9.8.jar"/>
-      <include name="slf4j-api-1.7.25.jar" />
-      <include name="xz-1.8.jar"/>
+      <include name="commons-codec-1.10.jar"/>
+      <include name="commons-compress-1.13.jar"/>
+      <include name="jackson-annotations-2.8.6.jar"/>
+      <include name="jackson-core-2.8.6.jar"/>
+      <include name="jackson-databind-2.8.6.jar"/>
+      <include name="slf4j-api-1.7.22.jar" />
+      <include name="xz-1.6.jar"/>
   </patternset>
 
   <target name="coverage-check">
diff --git a/src/build b/src/build
index 42ee1fc..ed48192 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit 42ee1fc086b0e86cddf56475124a547465484321
+Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits