From 06b6f8794f243bd9c53e62aaf533fb4bbdceeb2a Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 18 Jan 2021 19:18:16 +0100
Subject: [PATCH 1/4] gitlab-ci: retry flaky testFullDebugUnitTest

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 52d59fc6a..05e90dedf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ test_lint_pmd_checkstyle:
     - ./gradlew assemble
     # always report on lint errors to the build log
     - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
-    - ./gradlew testFullDebugUnitTest
+    - ./gradlew testFullDebugUnitTest || ./gradlew testFullDebugUnitTest || ./gradlew testFullDebugUnitTest || set_error
     - ./gradlew lint
     - ./gradlew pmd || (export EXITVALUE=1; echo ERROR !!)
     - ./gradlew checkstyle || (export EXITVALUE=1; echo ERROR !!)

From c697501f8fdb64ddc7e63983462f8fa741fc0cff Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 18 Jan 2021 19:19:23 +0100
Subject: [PATCH 2/4] gitlab-ci: run all test_lint_pmd_checkstyle parts, even
 after failures

---
 .gitlab-ci.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 05e90dedf..ef27b63ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,18 +37,19 @@ test_lint_pmd_checkstyle:
   <<: *test-template
   script:
     - export EXITVALUE=0
+    - function set_error() { export EXITVALUE=1; printf "\x1b[31mERROR `history|tail -2|head -1|cut -b 6-500`\x1b[0m\n"; }
     - ./gradlew assemble
     # always report on lint errors to the build log
     - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
     - ./gradlew testFullDebugUnitTest || ./gradlew testFullDebugUnitTest || ./gradlew testFullDebugUnitTest || set_error
-    - ./gradlew lint
-    - ./gradlew pmd || (export EXITVALUE=1; echo ERROR !!)
-    - ./gradlew checkstyle || (export EXITVALUE=1; echo ERROR !!)
-    - ./tools/check-format-strings.py || (export EXITVALUE=1; echo ERROR !!)
-    - ./tools/check-fastlane-whitespace.py || (export EXITVALUE=1; echo ERROR !!)
-    - ./tools/remove-unused-and-blank-translations.py || (export EXITVALUE=1; echo ERROR !!)
+    - ./gradlew lint || set_error
+    - ./gradlew pmd || set_error
+    - ./gradlew checkstyle || set_error
+    - ./tools/check-format-strings.py || set_error
+    - ./tools/check-fastlane-whitespace.py || set_error
+    - ./tools/remove-unused-and-blank-translations.py || set_error
     - echo "These are unused or blank translations that should be removed:"
-    - git --no-pager diff --ignore-all-space --name-only --exit-code app/src/*/res/values*/strings.xml || (export EXITVALUE=1; echo ERROR !!)
+    - git --no-pager diff --ignore-all-space --name-only --exit-code app/src/*/res/values*/strings.xml || set_error
     - exit $EXITVALUE
 
 errorprone:

From c5056a81671fa67d5e921009b44b134c9507eb92 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 12 Jan 2021 18:17:57 +0100
Subject: [PATCH 3/4] gitlab-ci: run errorprone with Java11

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef27b63ef..5ef24f07b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -55,6 +55,10 @@ test_lint_pmd_checkstyle:
 errorprone:
   stage: test
   script:
+    - apt-get update
+    - apt-get install -t stretch-backports openjdk-11-jdk-headless
+    - update-java-alternatives --set java-1.11.0-openjdk-amd64
+    - export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
     - cat config/errorprone.gradle >> app/build.gradle
     - ./gradlew -Dorg.gradle.dependency.verification=lenient assembleDebug
 

From 83b7d7ff6761b2059da2c21924c00ac5a965c8ba Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 19 Jan 2021 09:06:05 +0100
Subject: [PATCH 4/4] bump all test dependencies

Hopefully this will give some stability in the Robolectric tests.
---
 app/build.gradle                 | 16 +++---
 gradle/verification-metadata.xml | 88 +++++++++++++++++++++++++++++++-
 2 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ee8aed5dd..26d2a0a17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -169,19 +169,19 @@ dependencies {
     fullImplementation 'org.jmdns:jmdns:3.5.5'
     fullImplementation 'org.nanohttpd:nanohttpd:2.3.1'
 
-    testImplementation 'androidx.test:core:1.2.0'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'androidx.test:core:1.3.0'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation 'org.robolectric:robolectric:4.3'
     testImplementation 'org.mockito:mockito-core:3.3.3'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.bouncycastle:bcprov-jdk15on:1.65'
 
-    androidTestImplementation 'androidx.test:core:1.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'androidx.test:monitor:1.2.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:core:1.3.0'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test:rules:1.3.0'
+    androidTestImplementation 'androidx.test:monitor:1.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 }
 
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index fddac78f6..a0a56000a 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -40,12 +40,16 @@
          <trusted-key id="5767f9cde920750621875079a40e24b5b408dbd5" group="org.robolectric"/>
          <trusted-key id="5897253bea3046aeea95a067e93671c7272b7b3f" group="org.jdom" name="jdom2" version="2.0.6"/>
          <trusted-key id="5f7903f86c625ed6efa07ab85110767b6248d3c0" group="org.jmdns" name="jmdns" version="3.5.5"/>
-         <trusted-key id="6214760097dc5cfad0175ac2c9fbaa83a8753994" group="^com[.]fasterxml($|([.].*))" regex="true"/>
+         <trusted-key id="6214760097dc5cfad0175ac2c9fbaa83a8753994">
+            <trusting group="^com[.]fasterxml($|([.].*))" regex="true"/>
+            <trusting group="com.fasterxml.jackson.core"/>
+         </trusted-key>
          <trusted-key id="628462a5eaba59d57e99ae5a840b2bf6da8ed8c8" group="com.google.android.apps.common.testing.accessibility.framework" name="accessibility-test-framework" version="2.1"/>
          <trusted-key id="67497e9d680ce8e95bd6b8f85ad66315fc018797" group="com.beust" name="jcommander" version="1.72"/>
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1">
             <trusting group="^com[.]google($|([.].*))" regex="true"/>
             <trusting group="com.google.guava"/>
+            <trusting group="com.google.guava" name="guava"/>
          </trusted-key>
          <trusted-key id="6f538074ccebf35f28af9b066a0975f8b1127b83" group="org.jetbrains.kotlin"/>
          <trusted-key id="6f7e5acbcd02db60dfd232e45e1f79a7c298661e" group="com.google.auto" name="auto-parent"/>
@@ -87,7 +91,10 @@
          <trusted-key id="ce3285f320685193d11fea01f6ce9695c9318406" group="com.google.zxing"/>
          <trusted-key id="ce8075a251547bee249bc151a2115ae15f6b8b72" group="org.apache.commons"/>
          <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
-         <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92" group="org.antlr"/>
+         <trusted-key id="d54a395b5cf3f86eb45f6e426b1b008864323b92">
+            <trusting group="org.antlr"/>
+            <trusting group="org.antlr" name="antlr4-runtime"/>
+         </trusted-key>
          <trusted-key id="d6f1bc78607808ec8e9f69437a8860944fad5f62">
             <trusting group="org.apache.commons"/>
             <trusting group="commons-net"/>
@@ -464,6 +471,11 @@
             <sha256 value="8a42e815fcdb7981c2d1dcf1ba20c328e1ce1ed6b798682ba572295e91dc9779" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="core" version="1.3.0">
+         <artifact name="core-1.3.0.aar">
+            <sha256 value="86549cae8c5b848f817e2c716e174c7dab61caf0b4df9848680eeb753089a337" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="monitor" version="1.2.0">
          <artifact name="monitor-1.2.0.aar">
             <sha256 value="fc97ca3f00f8ca30b7d5167fbd8736756048e2cc4f8e92dc891106751a5baeef" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -472,6 +484,11 @@
             <sha256 value="0ea74b28a750735b12905476bf38e7373e924db7f2b88ecd9332d4a6285cafe6" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="monitor" version="1.3.0">
+         <artifact name="monitor-1.3.0.aar">
+            <sha256 value="f73a31306a783e63150c60c49e140dc38da39a1b7947690f4b73387b5ebad77e" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="rules" version="1.2.0">
          <artifact name="rules-1.2.0.aar">
             <sha256 value="24bd7111e0db91b4a5f6d5c3e3e89698580dc90d29273d04a775bb7fe7c2a761" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -480,6 +497,11 @@
             <sha256 value="4746045af7a8b3f4de3f4dce9d8dd2ab0044087b8b7a4866a3c66892516a90f1" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="rules" version="1.3.0">
+         <artifact name="rules-1.3.0.aar">
+            <sha256 value="c1753946c498b0d5d7cf341cfed661f66915c4c9deb4ed10462a08ae33b2429a" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test" name="runner" version="1.2.0">
          <artifact name="runner-1.2.0.aar">
             <sha256 value="5387e011167a3c8da08d99b5d59248c0e2da839317b48ebf202e31dc1f791ec1" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -488,6 +510,11 @@
             <sha256 value="8cd8fb464d02f198235d51e1a19aed41f12977c152a62c27462e17a90b4a5f08" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test" name="runner" version="1.3.0">
+         <artifact name="runner-1.3.0.aar">
+            <sha256 value="61d13f5a9fcbbd73ba18fa84e1d6a0111c6e1c665a89b418126966e61fffd93b" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test.espresso" name="espresso-core" version="3.2.0">
          <artifact name="espresso-core-3.2.0.aar">
             <sha256 value="beb4712c2520c1da30ac1f25506871f16ea5b83ee686ece5a258769df1a01e15" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -496,6 +523,11 @@
             <sha256 value="244699b0d1409796c29d9c90250b4a1e906a33898da12612cbb482d063d3180b" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test.espresso" name="espresso-core" version="3.3.0">
+         <artifact name="espresso-core-3.3.0.aar">
+            <sha256 value="23ebf6014645e0c60aec7d1ed924d4d4c848ae8c3673b7d8d06b2ec6a56cafee" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test.espresso" name="espresso-idling-resource" version="3.2.0">
          <artifact name="espresso-idling-resource-3.2.0.aar">
             <sha256 value="c1a0454fe95788122ba652c3ecff7ec538c7e27de206aed970f2809fb8090d09" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -504,6 +536,11 @@
             <sha256 value="56f01eb1ad41eb637ed29a2a9f6ec0b9a449ed28656d55fa17f7d34fe0e388c2" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test.espresso" name="espresso-idling-resource" version="3.3.0">
+         <artifact name="espresso-idling-resource-3.3.0.aar">
+            <sha256 value="29519b112731f289cc6e2f9b2eccc5ea72c754b04272bb93370f45d7e170a7c6" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test.ext" name="junit" version="1.1.1">
          <artifact name="junit-1.1.1.aar">
             <sha256 value="449df418d2916a0f86fe7dafb1edb09480fafb6e995d5c751c7d0d1970d4ae72" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -512,6 +549,11 @@
             <sha256 value="73df3ef2ed6608706ea86151a5c1fd9dcc8c386963dd8723e259f32643610132" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
+      <component group="androidx.test.ext" name="junit" version="1.1.2">
+         <artifact name="junit-1.1.2.aar">
+            <sha256 value="6c6ab120c640bf16fcaae69cb83c144d0ed6b6298562be0ac35e37ed969c0409" origin="Generated by Gradle because artifact wasn't signed"/>
+         </artifact>
+      </component>
       <component group="androidx.test.uiautomator" name="uiautomator" version="2.2.0">
          <artifact name="uiautomator-2.2.0.aar">
             <sha256 value="2838e9d961dbffefbbd229a2bd4f6f82ac4fb2462975862a9e75e9ed325a3197" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -594,6 +636,7 @@
       </component>
       <component group="ch.acra" name="acra" version="4.9.1">
          <artifact name="acra-4.9.1.aar">
+            <pgp value="0394681addddb4f6388a64d295123567c1886c47"/>
             <sha256 value="d2762968c448757a7d6acc9f141881d9632f664988e9723ece33b5f7c79f3bc9" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="acra-4.9.1.pom">
@@ -610,6 +653,7 @@
       </component>
       <component group="com.almworks.sqlite4java" name="sqlite4java" version="0.282">
          <artifact name="sqlite4java-0.282.jar">
+            <pgp value="2bab4466b44f54f8f99bbbdd5ed22f661bbf0acc"/>
             <sha256 value="9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="sqlite4java-0.282.pom">
@@ -914,6 +958,7 @@
       </component>
       <component group="com.ashokvarma.android" name="bottom-navigation-bar" version="2.0.5">
          <artifact name="bottom-navigation-bar-2.0.5.aar">
+            <pgp value="984460dfd8f76a226f7dede2e483332711b8c7d6"/>
             <sha256 value="53175f7ab9e8faf36a046f9a74da26af64259038997748c7df56580f981e5077" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="bottom-navigation-bar-2.0.5.pom">
@@ -922,6 +967,7 @@
       </component>
       <component group="com.beust" name="jcommander" version="1.72">
          <artifact name="jcommander-1.72.jar">
+            <pgp value="67497e9d680ce8e95bd6b8f85ad66315fc018797"/>
             <sha256 value="e0de160b129b2414087e01fe845609cd55caec6820cfd4d0c90fabcc7bdb8c1e" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="jcommander-1.72.pom">
@@ -995,6 +1041,7 @@
       </component>
       <component group="com.google.android.apps.common.testing.accessibility.framework" name="accessibility-test-framework" version="2.1">
          <artifact name="accessibility-test-framework-2.1.jar">
+            <pgp value="628462a5eaba59d57e99ae5a840b2bf6da8ed8c8"/>
             <sha256 value="7b0aa6ed7553597ce0610684a9f7eca8021eee218f2e2f427c04a7fbf5f920bd" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="accessibility-test-framework-2.1.pom">
@@ -1011,6 +1058,7 @@
       </component>
       <component group="com.google.auto" name="auto-common" version="0.8">
          <artifact name="auto-common-0.8.jar">
+            <pgp value="92d3e6630b4b92cb2ef124994786cbe7d4906b68"/>
             <sha256 value="97db1709f57b91b32edacb596ef4641872f227b7d99ad90e467f0d77f5ba134a" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="auto-common-0.8.pom">
@@ -1043,6 +1091,7 @@
       </component>
       <component group="com.google.auto.service" name="auto-service" version="1.0-rc4">
          <artifact name="auto-service-1.0-rc4.jar">
+            <pgp value="3288b8be8512d6c0ca185268c51e6cbc7ff46f0b"/>
             <sha256 value="e422d49c312fd2031222e7306e8108c1b4118eb9c049f1b51eca280bed87e924" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="auto-service-1.0-rc4.pom">
@@ -1051,6 +1100,7 @@
       </component>
       <component group="com.google.auto.value" name="auto-value-annotations" version="1.6.2">
          <artifact name="auto-value-annotations-1.6.2.jar">
+            <pgp value="c7be5bcc9fec15518cfda882b0f3710fa64900e7"/>
             <sha256 value="b48b04ddba40e8ac33bf036f06fc43995fc5084bd94bdaace807ce27d3bea3fb" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="auto-value-annotations-1.6.2.pom">
@@ -1101,6 +1151,7 @@
       </component>
       <component group="com.google.code.gson" name="gson" version="2.8.5">
          <artifact name="gson-2.8.5.jar">
+            <pgp value="afcc4c7594d09e2182c60e0f7a01b0f236e5430f"/>
             <sha256 value="233a0149fc365c9f6edbd683cfe266b19bdc773be98eabdaf6b3c924b48e7d81" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="gson-2.8.5.pom">
@@ -1276,6 +1327,7 @@
       </component>
       <component group="com.google.protobuf" name="protobuf-java" version="2.6.1">
          <artifact name="protobuf-java-2.6.1.jar">
+            <pgp value="ae2b18e836c5f30687f37efdcc6346f2ce3872d9"/>
             <sha256 value="55aa554843983f431df5616112cf688d38aa17c132357afd1c109435bfdac4e6" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="protobuf-java-2.6.1.pom">
@@ -1305,6 +1357,7 @@
       </component>
       <component group="com.google.zxing" name="core" version="3.3.3">
          <artifact name="core-3.3.3.jar">
+            <pgp value="ce3285f320685193d11fea01f6ce9695c9318406"/>
             <sha256 value="5820f81e943e4bce0329306621e2d6255d2930b0a6ce934c5c23c0d6d3f20599" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="core-3.3.3.pom">
@@ -1342,6 +1395,7 @@
       </component>
       <component group="com.hannesdorfmann" name="adapterdelegates3" version="3.0.1">
          <artifact name="adapterdelegates3-3.0.1.aar">
+            <pgp value="49977dad0140e24894f9b955354214e5e508c045"/>
             <sha256 value="1b20d099d6e7afe57aceca13b713b386959d94a247c3c06a7aeb65b866ece02f" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="adapterdelegates3-3.0.1.pom">
@@ -1350,6 +1404,7 @@
       </component>
       <component group="com.ibm.icu" name="icu4j" version="53.1">
          <artifact name="icu4j-53.1.jar">
+            <pgp value="cb3190ca7842439e57f3712e44ce7bf2825ea2cd"/>
             <sha256 value="e37a4467bac5cdeb02c5c4b8e5063d2f4e67b69e3c7df6d6b610f13185572bab" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="icu4j-53.1.pom">
@@ -1358,6 +1413,7 @@
       </component>
       <component group="com.nostra13.universalimageloader" name="universal-image-loader" version="1.9.5">
          <artifact name="universal-image-loader-1.9.5.jar">
+            <pgp value="280bcdfa20225ff340f9e3a2fb52acb341119b0a"/>
             <sha256 value="dbd5197ffec3a8317533190870a7c00ff3750dd6a31241448c6a5522d51b65b4" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="universal-image-loader-1.9.5.pom">
@@ -1366,6 +1422,7 @@
       </component>
       <component group="com.puppycrawl.tools" name="checkstyle" version="7.2">
          <artifact name="checkstyle-7.2.jar">
+            <pgp value="06d34ed6ff73de368a772a781063fe98bcecb758"/>
             <sha256 value="bd46b8468bf2fbf0ff5e1c9c9c385dbc47d4a5936d3631ebe10717967ce073ab" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="checkstyle-7.2.pom">
@@ -1374,6 +1431,7 @@
       </component>
       <component group="com.squareup" name="javapoet" version="1.10.0">
          <artifact name="javapoet-1.10.0.jar">
+            <pgp value="a6d6c97108b8585f91b158748671a8df71296252"/>
             <sha256 value="20ef4b82e43ff7c652281a21313cf3b941092467add3fa73509c26f6969efdab" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="javapoet-1.10.0.pom">
@@ -1382,6 +1440,7 @@
       </component>
       <component group="com.squareup" name="javawriter" version="2.1.1">
          <artifact name="javawriter-2.1.1.jar">
+            <pgp value="90ee19787a7bcf6fd37a1e9180c08b1c29100955"/>
             <sha256 value="f699823d0081f69cbb676c1845ea222e0ada79bc88a53e5d22d8bd02d328f57e" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="javawriter-2.1.1.pom">
@@ -1458,6 +1517,7 @@
       </component>
       <component group="commons-beanutils" name="commons-beanutils" version="1.9.3">
          <artifact name="commons-beanutils-1.9.3.jar">
+            <pgp value="dddee87612e9fb95f5c8d91e411063a3a0ffd119"/>
             <sha256 value="c058e39c7c64203d3a448f3adb588cb03d6378ed808485618f26e137f29dae73" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-beanutils-1.9.3.pom">
@@ -1466,6 +1526,7 @@
       </component>
       <component group="commons-cli" name="commons-cli" version="1.3.1">
          <artifact name="commons-cli-1.3.1.jar">
+            <pgp value="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0"/>
             <sha256 value="3a2f057041aa6a8813f5b59b695f726c5e85014a703d208d7e1689098e92d8c0" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-cli-1.3.1.pom">
@@ -1482,6 +1543,7 @@
       </component>
       <component group="commons-collections" name="commons-collections" version="3.2.2">
          <artifact name="commons-collections-3.2.2.jar">
+            <pgp value="0cc641c3a62453ab390066c4a41f13c999945293"/>
             <sha256 value="eeeae917917144a68a741d4c0dff66aa5c5c5fd85593ff217bced3fc8ca783b8" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-collections-3.2.2.pom">
@@ -1498,6 +1560,7 @@
       </component>
       <component group="commons-io" name="commons-io" version="2.6">
          <artifact name="commons-io-2.6.jar">
+            <pgp value="cd5464315f0b98c77e6e8ecd9daadc1c9fcc82d0"/>
             <sha256 value="f877d304660ac2a142f3865badfc971dec7ed73c747c7f8d5d2f5139ca736513" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-io-2.6.pom">
@@ -1514,6 +1577,7 @@
       </component>
       <component group="commons-net" name="commons-net" version="3.6">
          <artifact name="commons-net-3.6.jar">
+            <pgp value="d6f1bc78607808ec8e9f69437a8860944fad5f62"/>
             <sha256 value="d3b3866c61a47ba3bf040ab98e60c3010d027da0e7a99e1755e407dd47bc2702" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-net-3.6.pom">
@@ -1538,6 +1602,7 @@
       </component>
       <component group="io.reactivex" name="rxjava" version="1.1.0">
          <artifact name="rxjava-1.1.0.jar">
+            <pgp value="1d9aa7f9e1e2824728b8cd1794b291aef984a085"/>
             <sha256 value="2c162afd78eba217cdfee78b60e85d3bfb667db61e12bc95e3cf2ddc5beeadf6" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="rxjava-1.1.0.pom">
@@ -1554,6 +1619,7 @@
       </component>
       <component group="javax.activation" name="javax.activation-api" version="1.2.0">
          <artifact name="javax.activation-api-1.2.0.jar">
+            <pgp value="4f7e32d440ef90a83011a8fc6425559c47cc79c4"/>
             <sha256 value="43fdef0b5b6ceb31b0424b208b930c74ab58fac2ceeb7b3f6fd3aeb8b5ca4393" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="javax.activation-api-1.2.0.pom">
@@ -1562,6 +1628,7 @@
       </component>
       <component group="javax.annotation" name="javax.annotation-api" version="1.3.2">
          <artifact name="javax.annotation-api-1.3.2.jar">
+            <pgp value="4f7e32d440ef90a83011a8fc6425559c47cc79c4"/>
             <sha256 value="e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="javax.annotation-api-1.3.2.pom">
@@ -1578,6 +1645,7 @@
       </component>
       <component group="javax.xml.bind" name="jaxb-api" version="2.3.1">
          <artifact name="jaxb-api-2.3.1.jar">
+            <pgp value="70cd19bfd9f6c330027d6f260315bfb7970a144f"/>
             <sha256 value="88b955a0df57880a26a74708bc34f74dcaf8ebf4e78843a28b50eae945732b06" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="jaxb-api-2.3.1.pom">
@@ -1591,6 +1659,7 @@
       </component>
       <component group="junit" name="junit" version="4.12">
          <artifact name="junit-4.12.jar">
+            <pgp value="d4c89ea4aaf455fd88b22087efe8086f9e93774e"/>
             <sha256 value="59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="junit-4.12.pom">
@@ -1599,12 +1668,18 @@
       </component>
       <component group="junit" name="junit" version="4.13">
          <artifact name="junit-4.13.jar">
+            <pgp value="ff6e2c001948c5f2f38b0cc385911f425ec61b51"/>
             <sha256 value="4b8532f63bdc0e0661507f947eb324a954d1dbac631ad19c8aa9a00feed1d863" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="junit-4.13.pom">
             <sha256 value="9a0dc4c3fa2b086e708226737ef4bb37847c3cb1ce4e203517c09f6305b2267e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="junit" name="junit" version="4.13.1">
+         <artifact name="junit-4.13.1.jar">
+            <pgp value="ff6e2c001948c5f2f38b0cc385911f425ec61b51"/>
+         </artifact>
+      </component>
       <component group="nekohtml" name="nekohtml" version="1.9.6.2">
          <artifact name="nekohtml-1.9.6.2.jar">
             <sha256 value="fdff6cfa9ed9cc911c842a5d2395f209ec621ef1239d46810e9e495809d3ae09" origin="Generated by Gradle because artifact wasn't signed"/>
@@ -1849,6 +1924,7 @@
       </component>
       <component group="org.apache.commons" name="commons-lang3" version="3.8.1">
          <artifact name="commons-lang3-3.8.1.jar">
+            <pgp value="b6e73d84ea4fcc47166087253faad2cd5ecbb314"/>
             <sha256 value="dac807f65b07698ff39b1b07bfef3d87ae3fd46d91bbf8a2bc02b2a831616f68" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="commons-lang3-3.8.1.pom">
@@ -1946,6 +2022,7 @@
       </component>
       <component group="org.apache.maven" name="maven-ant-tasks" version="2.1.3">
          <artifact name="maven-ant-tasks-2.1.3.jar">
+            <pgp value="042b29e928995b9db963c636c7ca19b7b620d787"/>
             <sha256 value="f16b5ea711dfe0323454b880180aa832420ec039936e4aa75fb978748634808a" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="maven-ant-tasks-2.1.3.pom">
@@ -2259,6 +2336,7 @@
       </component>
       <component group="org.hamcrest" name="hamcrest" version="2.2">
          <artifact name="hamcrest-2.2.jar">
+            <pgp value="e3a9f95079e84ce201f7cf60bede11eaf1164480"/>
             <sha256 value="5e62846a89f05cd78cd9c1a553f340d002458380c320455dd1f8fc5497a8a1c1" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="hamcrest-2.2.pom">
@@ -2362,6 +2440,7 @@
       </component>
       <component group="org.jmdns" name="jmdns" version="3.5.5">
          <artifact name="jmdns-3.5.5.jar">
+            <pgp value="5f7903f86c625ed6efa07ab85110767b6248d3c0"/>
             <sha256 value="894c852b26001e3bb1ad0f6915e73706aa590637ed5d731b652a146186504737" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="jmdns-3.5.5.pom">
@@ -2370,6 +2449,7 @@
       </component>
       <component group="org.jvnet.staxex" name="stax-ex" version="1.8">
          <artifact name="stax-ex-1.8.jar">
+            <pgp value="70cd19bfd9f6c330027d6f260315bfb7970a144f"/>
             <sha256 value="95b05d9590af4154c6513b9c5dc1fb2e55b539972ba0a9ef28e9a0c01d83ad77" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="stax-ex-1.8.pom">
@@ -2378,6 +2458,7 @@
       </component>
       <component group="org.mockito" name="mockito-core" version="3.3.3">
          <artifact name="mockito-core-3.3.3.jar">
+            <pgp value="cc4483cd6a3eb2939b948667a1b4460d8ba7b9af"/>
             <sha256 value="4be648c50456fba4686ba825000d628c1d805a3b92272ba9ad5b697dfa43036b" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="mockito-core-3.3.3.pom">
@@ -2386,6 +2467,7 @@
       </component>
       <component group="org.nanohttpd" name="nanohttpd" version="2.3.1">
          <artifact name="nanohttpd-2.3.1.jar">
+            <pgp value="4cf4b443734c0aed8dc93a1f6132aae95d8e9fe0"/>
             <sha256 value="de864c47818157141a24c9acb36df0c47d7bf15b7ff48c90610f3eb4e5df0e58" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="nanohttpd-2.3.1.pom">
@@ -2399,6 +2481,7 @@
       </component>
       <component group="org.objenesis" name="objenesis" version="2.6">
          <artifact name="objenesis-2.6.jar">
+            <pgp value="e85aed155021af8a6c6b7a4a7c7d8456294423ba"/>
             <sha256 value="5e168368fbc250af3c79aa5fef0c3467a2d64e5a7bd74005f25d8399aeb0708d" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="objenesis-2.6.pom">
@@ -2561,6 +2644,7 @@
       </component>
       <component group="org.slf4j" name="slf4j-api" version="1.7.25">
          <artifact name="slf4j-api-1.7.25.jar">
+            <pgp value="475f3b8e59e6e63aa78067482c7b12f2a511e325"/>
             <sha256 value="18c4a0095d5c1da6b817592e767bb23d29dd2f560ad74df75ff3961dbde25b79" origin="Generated by Gradle"/>
          </artifact>
          <artifact name="slf4j-api-1.7.25.pom">