Commit 6ad185ca authored by Karsten Loesing's avatar Karsten Loesing
Browse files

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.
parent 7f36a2b1

CHANGELOG.md

+0 −20
Original line number Diff line number Diff line 
# Changes in version 1.10.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 1.9.1 - 2019-05-29



 * Medium changes

build.xml

+9 −9
Original line number Diff line number Diff line
@@ -15,16 +15,16 @@ 
  <property name="jarincludes" value="collector.properties logback.xml" />



  <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="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="xz-1.6.jar"/>

      <include name="metrics-lib-${metricslibversion}-thin.jar"/>

      <include name="logback-core-1.2.3.jar" />

      <include name="logback-classic-1.2.3.jar" />

      <include name="slf4j-api-1.7.25.jar" />

      <include name="logback-core-1.1.9.jar" />

      <include name="logback-classic-1.1.9.jar" />

      <include name="slf4j-api-1.7.22.jar" />

  </patternset>



  <target name="coverage-check">

build @ ed481921

Original line number Diff line number Diff line 
Subproject commit 42ee1fc086b0e86cddf56475124a547465484321
 
Subproject commit ed4819215aa60cc8935f955d9404f30e83dd892b

src/main/java/org/torproject/metrics/collector/conf/Key.java

+1 −3
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ public enum Key { 
  private static Set<String> keys;



  /**

   * Instantiate a new {@code Key} using the given class for the key value.

   *

   * @param clazz Class of key value.

   * @param Class of key value.

   */

  Key(Class clazz) {

    this.clazz = clazz;

src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java

+1 −1

File changed.

Contains only whitespace changes.