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

[karsten at torproject.org]

commit ed4819215aa60cc8935f955d9404f30e83dd892b
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Sun Jul 28 21:31:42 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.
---
 java/base.xml           | 32 ++++++++++++--------------------
 java/metrics_checks.xml |  9 +--------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/java/base.xml b/java/base.xml
index d15f682..baa77f9 100644
--- a/java/base.xml
+++ b/java/base.xml
@@ -51,38 +51,30 @@
     <fileset dir="${libs}">
       <include name="junit4-4.12.jar"/>
       <include name="hamcrest-all-1.3.jar"/>
-      <include name="logback-core-1.2.3.jar" />
-      <include name="logback-classic-1.2.3.jar" />
+      <include name="logback-core-1.1.9.jar" />
+      <include name="logback-classic-1.1.9.jar" />
     </fileset>
   </path>
 
   <path id="checkstyle.classpath" >
     <fileset dir="${libs}">
-      <include name="antlr-2.7.7.jar" />
-      <include name="antlr4-runtime-4.7.2.jar" />
-      <include name="checkstyle-8.15.jar" />
-      <include name="commons-beanutils-1.9.3.jar" />
-      <include name="commons-collections3-3.2.2.jar" />
-      <include name="commons-logging-1.2.jar" />
-      <include name="guava-19.0.jar" />
-      <include name="java-atk-wrapper.jar" />
-      <include name="picocli-3.9.2.jar" />
+      <include name="checkstyle-6.17-all.jar" />
     </fileset>
   </path>
 
   <path id="cobertura.classpath">
     <fileset dir="${libs}">
       <include name="cobertura-2.1.1.jar" />
-      <include name="slf4j-api-1.7.25.jar" />
-      <include name="commons-lang3-3.8.jar" />
-      <include name="asm4-5.0.4.jar" />
-      <include name="asm4-util-5.0.4.jar" />
-      <include name="asm4-tree-5.0.4.jar" />
-      <include name="asm4-commons-5.0.4.jar" />
-      <include name="asm4-analysis-5.0.4.jar" />
+      <include name="slf4j-api-1.7.22.jar" />
+      <include name="commons-lang3-3.5.jar" />
+      <include name="asm4-5.0.3.jar" />
+      <include name="asm4-util-5.0.3.jar" />
+      <include name="asm4-tree-5.0.3.jar" />
+      <include name="asm4-commons-5.0.3.jar" />
+      <include name="asm4-analysis-5.0.3.jar" />
       <include name="oro-2.0.8.jar" />
-      <include name="logback-core-1.2.3.jar" />
-      <include name="logback-classic-1.2.3.jar" />
+      <include name="logback-core-1.1.9.jar" />
+      <include name="logback-classic-1.1.9.jar" />
     </fileset>
   </path>
 
diff --git a/java/metrics_checks.xml b/java/metrics_checks.xml
index cefde39..858d4ea 100644
--- a/java/metrics_checks.xml
+++ b/java/metrics_checks.xml
@@ -20,9 +20,6 @@
 
      - Limit line length to 80 [LineLength].
 
-     - Require the "while" of a do-while statement to start on the same
-       line as the closing brace of the "do" [RightCurly].
-
     Checkstyle is very configurable. Be sure to read the documentation at
     http://checkstyle.sf.net (or in your downloaded distribution).
 
@@ -73,11 +70,7 @@
         <module name="RightCurly"/>
         <module name="RightCurly">
             <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
-        </module>
-        <module name="RightCurly">
-            <property name="option" value="same"/>
-            <property name="tokens" value="LITERAL_DO"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
         </module>
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true"/>