From 5433883034cd822f2c2512021ceac754f0b28607 Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Sat, 11 Jan 2020 19:18:54 +0100
Subject: [PATCH 1/3] Update code analysis tools

---
 check.xml                            |  6 ++--
 src/etc/checkstyle/checkstyle-config | 46 ++++++++++++++++------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/check.xml b/check.xml
index fe3baccff0..f3a0af40ee 100644
--- a/check.xml
+++ b/check.xml
@@ -58,7 +58,7 @@
   <!-- Ant Checkstyle -->
   <property name="checkstyle.src.dir" location="${etc.dir}/checkstyle"/>
   <property name="checkstyle.version"
-            value="6.19"
+            value="8.28"
             description="Which version of Checkstyle to use"/>
   <property name="checkstyle.reportdir"
             location="${reports.dir}/checkstyle"
@@ -88,7 +88,7 @@
 
   <!-- Findbugs: Running SpotBugs -->
   <property name="spotbugs.version"
-            value="3.1.4"
+            value="3.1.12"
             description="Which version of SpotBugs to use"/>
   <property name="findbugs.reportdir"
             location="${reports.dir}/findbugs"
@@ -130,7 +130,7 @@
 
   <!-- OWASP Dependency Check -->
   <property name="owasp.dc.version"
-            value="3.2.1"
+            value="5.2.4"
             description="Which version of OWASP Dependency Check to use"/>
   <property name="owasp.dc.report.dir"
             value="${reports.dir}/owasp-dc"
diff --git a/src/etc/checkstyle/checkstyle-config b/src/etc/checkstyle/checkstyle-config
index f0b46c56fd..d781a2501c 100644
--- a/src/etc/checkstyle/checkstyle-config
+++ b/src/etc/checkstyle/checkstyle-config
@@ -29,6 +29,16 @@
   <!-- size limits -->
   <module name="FileLength"/>
   <module name="FileTabCharacter"/>
+  <module name="LineLength">
+    <property name="max" value="100"/>
+    <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
+    <property name="tabWidth" value="4"/>
+  </module>
+
+  <module name="RegexpSingleline">
+    <!-- \s matches whitespace character, $ matches end of line. -->
+    <property name="format" value="\s+$"/>
+  </module>
 
   <module name="TreeWalker">
     <!-- Javadoc requirements -->
@@ -37,7 +47,7 @@
     </module>
     <module name="JavadocMethod">
       <property name="scope" value="protected"/>
-      <property name="allowUndeclaredRTE" value="true"/>
+      <!-- <property name="allowUndeclaredRTE" value="true"/> -->
     </module>
     <module name="JavadocVariable">
        <property name="scope" value="public"/>
@@ -61,11 +71,6 @@
     <module name="UnusedImports"/>
 
     <!-- size limits -->
-    <module name="LineLength">
-      <property name="max" value="100"/>
-      <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
-      <property name="tabWidth" value="4"/>
-    </module>
     <module name="MethodLength"/>
     <module name="ParameterNumber"/>
 
@@ -93,13 +98,14 @@
 
     <!-- Checks for common coding problems -->
     <!-- <module name="AvoidInlineConditionals"/> -->
+    <!-- <module name="DoubleCheckedLocking"/> --> <!-- removed in checkstyle 5.6 -->
     <module name="EmptyStatement"/>
     <module name="EqualsHashCode"/>
     <module name="IllegalInstantiation">
       <property name="classes" value="java.lang.Boolean"/>
     </module>
-    <!-- <module name="InnerAssignment"/> -->
-    <!-- <module name="MagicNumber"/> -->
+    <module name="InnerAssignment"/>
+    <module name="MagicNumber"/>
     <module name="MissingSwitchDefault"/>
     <!-- Allow redundant throw declarations for doc purposes
     <module name="RedundantThrows">
@@ -121,19 +127,19 @@
     <!-- <module name="TodoComment"/> -->
     <module name="UpperEll"/>
     <!-- allow comment suppression of checks -->
-    <module name="FileContentsHolder"/>
-  </module>
-
-  <module name="RegexpSingleline">
-    <!-- \s matches whitespace character, $ matches end of line. -->
-    <property name="format" value="\s+$"/>
+    <!-- <module name="FileContentsHolder"/> --><!-- removed in 8.2 -->
+    <!--
+    <module name="GenericIllegalRegexp">
+      <property name="format" value="\s+$"/>
+      <property name="message" value="Line has trailing spaces."/>
+    </module>
+    -->
+    <module name="SuppressionCommentFilter">
+      <property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
+      <property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
+      <property name="checkFormat" value="$1"/>
+    </module>
   </module>
 
   <!-- <module name="au.com.redhillconsulting.simian.SimianCheck"/> -->
-  <module name="SuppressionCommentFilter">
-    <property name="offCommentFormat" value="CheckStyle\:([\w\|]+) *OFF"/>
-    <property name="onCommentFormat" value="CheckStyle\:([\w\|]+) *ON"/>
-    <property name="checkFormat" value="$1"/>
-  </module>
-
 </module>

From 5764fe9803a60e0c9453875f49f6f627b474e676 Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Sat, 11 Jan 2020 19:20:56 +0100
Subject: [PATCH 2/3] =?UTF-8?q?Don=E2=80=99t=20fetch=20Ivy=20if=20it=20is?=
 =?UTF-8?q?=20available=20(homebrew=20Ant=20distribution=20includes=20Ivy?=
 =?UTF-8?q?=20and=20BCEL)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 check.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/check.xml b/check.xml
index f3a0af40ee..6191038492 100644
--- a/check.xml
+++ b/check.xml
@@ -147,8 +147,9 @@
             value="${htmlcheck.report.dir}/report.txt"
             description="Report file of the HTML-Check"/>
 
+  <available classname="org.apache.ivy.Ivy" property="ivy.present"/>
 
-  <target name="init-ivy">
+  <target name="init-ivy" unless="ivy.present">
     <property name="ivy.version"  value="2.5.0"/>
     <property name="ivy.jar.url"  value="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
     <property name="ivy.jar.dir"  value="${build.dir}/ivy"/>

From 09ea5bf41e2e45f0583b9beddeb7ed603d63df64 Mon Sep 17 00:00:00 2001
From: twogee <g.grigelionis@gmail.com>
Date: Sat, 11 Jan 2020 21:18:50 +0100
Subject: [PATCH 3/3] Superfluous explicit calls to transitive dependencies

---
 build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 35ba766f64..e23b2d5d96 100644
--- a/build.xml
+++ b/build.xml
@@ -613,7 +613,7 @@
          Build the code
        ===================================================================
   -->
-  <target name="build" depends="prepare, compile, compile-jdk9+" unless="skip.build"
+  <target name="build" depends="compile,compile-jdk9+" unless="skip.build"
           description="--> compiles the source code">
 
     <!-- Builds and verifies that the classes belonging in the confined package of
@@ -1715,7 +1715,7 @@ ${antunit.reports}
     <fail if="tests.failed" message="Unit tests failed"/>
   </target>
 
-  <target name="test-init" depends="probe-offline,check-optional-packages,dump-info">
+  <target name="test-init" depends="probe-offline,dump-info">
     <mkdir dir="${build.junit.tmpdir}"/>
     <condition property="sun.io.useCanonCaches" value="false">
       <not>