hyphanet · ArneBab · Sep 22, 2024 · Sep 17, 2024 · Sep 17, 2024 · Sep 17, 2024
diff --git a/build.gradle b/build.gradle
@@ -250,10 +250,9 @@ dependencies {
     implementation "org.unbescape:unbescape:1.1.6.RELEASE"
     implementation "org.slf4j:slf4j-api:1.7.25"
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation "org.mockito:mockito-core:1.9.5"
-    testImplementation "org.hamcrest:hamcrest-library:1.3"
-    testImplementation "org.hamcrest:hamcrest-core:1.3"
+    testImplementation "org.hamcrest:hamcrest:3.0"
     testImplementation "org.objenesis:objenesis:1.0"
 }
 

diff --git a/gradle/verification-keyring.gpg b/gradle/verification-keyring.gpg
diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -778,3 +778,211 @@ s4TCb+yfQ4PZxLgcdPaTzb39m9Zj9eSITnbdZ0ZoQKIXkp/crIhJBBgRAgAJBQJE
 v5JsdMMyJvQc+xtjXg7OVA==
 =RVv2
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub    85911F425EC61B51
+uid    Marc Philipp <mail@marcphilipp.de>
+uid    Open Source Development <mail@marcphilipp.de>
+uid    Marc Philipp <marc@junit.org>
+uid    Marc Philipp <mphilipp82@gmail.com>
+
+sub    8B2A34A7D4A9B8B3
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+bpJ8mdzS2PJko7mm
+=7SBx
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    152888E10EF880B3
+uid    Daniel Fernandez <dfernandez@users.sourceforge.net>
+
+sub    1CB037909F7E059F
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBEtnRE8BCACzVmIkAALxSHQAbp5HCXCLqL16UnxJcrcUIcnRQSXiwjAcNsjS
+S1mRwr0WrmaquTQYDk1W8owUdmAXdTfSHgtJKFRKdJ20IymeXx1VrmUiiCNY9Jf1
+xYhaJAopMTeEp65q8enAZcxjyqVxk7wOPgKD6uakQDdwiJtWHsug7zlmUtzZ6Phk
+iCxhrJSasatOqQoJon+RMlsFYWLulDFv7CmDJq/GLS6bMDajKt+SXBsnKL/gUWZ4
+hT0sL4Ux6lkshyey1BSbmDbMnHmzR2Ng8oIzKziA900FFaAWsyg3S6vi6I4P/x4N
+PfOR2BiUwcPi7lA6Tp0lwPM0IdiUep9Nl13vABEBAAG0M0RhbmllbCBGZXJuYW5k
+ZXogPGRmZXJuYW5kZXpAdXNlcnMuc291cmNlZm9yZ2UubmV0PokBOAQTAQIAIgUC
+S2dETwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQFSiI4Q74gLNZ6Qf9
+G6Yr02yGjtoQEiKBhSRwyY44W+FBRLESFZ+M2yrVr74li0/1RVX0e0zyYUWQTWcY
+6ySzuvWdfqBlEeh+o7PPV5VwoBp/xHvbL8ufEREqjbL/0c/4O24ojTEWeOb7nGKr
+z5dxvy+fV6EzJfK37g3vYZoqy3uv1O8205UgzF84XpVW3pAmZRHz8G5+NapQD/nt
+p+zW1PqPK1FvRFxcMDsFhE0F4qAPB5W1jst+E/G3eyOeS5OxXePYiLaSlJo3XovP
+TgZKMZAu1WusPfrcTL+rzb8Rr/TQinb1jNkVCOyfqHk0Jfunda4dW8tgWLkau/A4
+eki1H5pOYEm7/lOQ3HRlLLkBDQRLZ0RPAQgArznjhUDrXc+Rj3JK5c9Kz7rIkRmj
+fvXAz/fWjgPGE75brZPcicuSY/DIMXglvYg4Nn2ELpfcdpA/2NbI9IbvBRvMm7lz
+un9mYlq4Id6kvpBhQbCg3ksyy6aailNB3oLN9Z3DFw2CnndDE9YuAkLHtSwR80yl
+M1Ain0OhHh+cPU9eoQSTZiPI4nmNFoLlIUmLHIqmGIndEsdkWg+BczFsc7ARKLn4
+1xHVg7/o1TBleyxUrLVp2LatNWZZdqD4pZfeAalrrmgTJHP89X++Qgtdt1baMWio
+mMUusUjxM+WuUSzPmYt8C2LG1dp8Dfvwr8DD98MrHwf1AkNfGGNSTWTWbQARAQAB
+iQEfBBgBAgAJBQJLZ0RPAhsMAAoJEBUoiOEO+ICzSdEIAIkL3iyzDsl8s76qY5EI
+JPodAYBeN85uA4V0tFdmnObUzas4Qkl8btGiYScQaeTBH+MepUqJiae59yOES2Yh
+y6bf9t1+WNkYUbPqvazSQgK1rujjlpvK33szMwaAr4OsiCXgLXjiiyUihNTu9yOn
+/kaV+ry1D1dVd05NgH/kHsGcXC7+bX9DrVYMzZd8vIDTK1cYEFSk/4f/ej5TkD1b
+VyuZpWG381vO/zchFeEFO68wd7KmVuUpfemZx4vaG6u/wA9DCulCVIhScBIXmLdw
+UWihEmfbGu3sZ3xuqmInxEJa8pPgjoTHTQ1KcUx8QDUSXg0Ne49z1DnRbB0ieTIV
+dqA=
+=llhr
+-----END PGP PUBLIC KEY BLOCK-----
+
+pub    BEDE11EAF1164480
+uid    Joe Schmetzer <joe@exubero.com>
+
+sub    4BE257B370130000
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+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
+33wjXAW0h+qq7/7Yq3w3/7ncv9sWIzU=
+=NtIH
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -7,10 +7,10 @@
          <trust file="commons-codec-1.4(-sources)*[.](jar|pom)" regex="true"/>
          <trust file="commons-logging-1.1.1(-sources)*[.](jar|pom)" regex="true"/>
          <trust file="commons-parent-[1-9]*[.]pom" regex="true"/>
-         <trust file="kxml2-2.3.0-sources.jar" regex="false"/>
+         <trust file="kxml2-2.3.0-sources.jar"/>
          <trust file="unbescape-1[.]1[.]6[.].*" regex="true"/>
          <trust file="mockito-core-1.9.5(-sources)*[.](jar|pom)" regex="true"/>
-         <trust file="apache-4.pom" regex="false"/>
+         <trust file="apache-4.pom"/>
       </trusted-artifacts>
       <trusted-keys>
          <trusted-key id="0785b3eff60b1b1bea94e0bb7c25280eae63ebe5" group="org.apache.httpcomponents"/>
@@ -21,12 +21,14 @@
          <trusted-key id="4db1a49729b053caf015cee9a6adfc93ef34893e" group="org.hamcrest"/>
          <trusted-key id="6658dd7f76fcdf7812114f85dc032628e927d006" group="com.android.tools.external.lombok" name="lombok-ast" version="0.2.2"/>
          <trusted-key id="694621a7227d8d5289699830abe9f3126bb741c1" group="com.google.guava"/>
+         <trusted-key id="839323a4780d5bf9a6978970152888e10ef880b3" group="org.unbescape" name="unbescape" version="1.1.6.RELEASE"/>
          <trusted-key id="90ee19787a7bcf6fd37a1e9180c08b1c29100955" group="com.squareup" name="javawriter" version="2.2.1"/>
          <trusted-key id="9d23533896a9784703585b6286e02c5a42196ca8" group="org.apache.commons" name="commons-compress" version="1.0"/>
          <trusted-key id="a5bd02b93e7a40482eb1d66a5f69ad087600b22c" group="org.ow2.asm"/>
          <trusted-key id="cacfbd4755a2fc78709bdd92be096e29edb8d141" group="net.sf.proguard"/>
-         <trusted-key id="d4c89ea4aaf455fd88b22087efe8086f9e93774e" group="junit" name="junit" version="4.12"/>
+         <trusted-key id="ff6e2c001948c5f2f38b0cc385911f425ec61b51" group="junit" name="junit" version="4.13.2"/>
          <trusted-key id="d9e6e4cc8f66b2034995c7192189ca6247f3dee5" group="^com[.]android[.]tools($|([.].*))" regex="true"/>
+         <trusted-key id="e3a9f95079e84ce201f7cf60bede11eaf1164480" group="org.hamcrest" name="hamcrest" version="3.0"/>
          <trusted-key id="e85aed155021af8a6c6b7a4a7c7d8456294423ba" group="org.objenesis" name="objenesis" version="1.0"/>
          <trusted-key id="fa7929f83ad44c4590f6cc6815c71c0a4e0b8edd" group="net.java.dev.jna"/>
          <trusted-key id="b920d295bf0e61cb4cf0896c33cd6733af5ec452" group="commons-logging"/>
@@ -205,12 +207,12 @@
             <sha256 value="4d29c5b6c385a89a777344b8b0f8dc29efe3faad3a7b97f87da25f0273a73893" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="junit" name="junit" version="4.12">
-         <artifact name="junit-4.12.jar">
-            <sha256 value="59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a" origin="Generated by Gradle"/>
+      <component group="junit" name="junit" version="4.13.2">
+         <artifact name="junit-4.13.2.jar">
+            <sha256 value="8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" origin="manually checked"/>
          </artifact>
-         <artifact name="junit-4.12.pom">
-            <sha256 value="90f163f78e3ffb6f1c7ad97de9e7eba4eea25807141b85d6d12be67ca25449c4" origin="Generated by Gradle"/>
+         <artifact name="junit-4.13.2.pom">
+            <sha256 value="569b6977ee4603c965c1c46c3058fa6e969291b0160eb6964dd092cd89eadd94" origin="manually checked"/>
          </artifact>
       </component>
       <component group="kxml2" name="kxml2" version="2.3.0">
@@ -357,25 +359,12 @@
             <sha256 value="32f2b3d6beedf54137ea2f9a3ebef67666d769f0966b08cd17fd7db59ba4d79f" origin="Generated by Gradle because artifact wasn't signed"/>
          </artifact>
       </component>
-      <component group="org.hamcrest" name="hamcrest-core" version="1.3">
-         <artifact name="hamcrest-core-1.3.jar">
-            <sha256 value="66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9" origin="Generated by Gradle"/>
+      <component group="org.hamcrest" name="hamcrest" version="3.0">
+         <artifact name="hamcrest-3.0.jar">
+            <sha256 value="5d66b6a4a680755cb6ed7cb104fa7835ef644667586ff0737adeb977c39ecdbc" origin="manually checked"/>
          </artifact>
-         <artifact name="hamcrest-core-1.3.pom">
-            <sha256 value="fde386a7905173a1b103de6ab820727584b50d0e32282e2797787c20a64ffa93" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.hamcrest" name="hamcrest-library" version="1.3">
-         <artifact name="hamcrest-library-1.3.jar">
-            <sha256 value="711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c" origin="Generated by Gradle"/>
-         </artifact>
-         <artifact name="hamcrest-library-1.3.pom">
-            <sha256 value="1ceb4bfb0f098ae29b935044b2363e11323313fe3ed2055df8b79737d5056277" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
-      <component group="org.hamcrest" name="hamcrest-parent" version="1.3">
-         <artifact name="hamcrest-parent-1.3.pom">
-            <sha256 value="6d535f94efb663bdb682c9f27a50335394688009642ba7a9677504bc1be4129b" origin="Generated by Gradle"/>
+         <artifact name="hamcrest-3.0.pom">
+            <sha256 value="4a04a68133bf32461f47b8a53c8ee9df4ce2f49a0dad9794bce8717bee5bac31" origin="manually checked"/>
          </artifact>
       </component>
       <component group="org.mockito" name="mockito-core" version="1.9.5">